From 31bedb1408e75483d4a1639aa88b0c2774597f06 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Fri, 8 Feb 2013 13:29:41 -0500 Subject: [PATCH] Cleanup imports Change-Id: I314ed99ece9b42d6ed1bf06ed90094e665621d06 --- .../gdb/internal/ui/osview/SessionOSData.java | 10 ++++++---- .../service/command/output/MIInfoOsInfo.java | 19 +++++++++---------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/SessionOSData.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/SessionOSData.java index bfcbed340ea..7784f92f91d 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/SessionOSData.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/SessionOSData.java @@ -27,6 +27,8 @@ import org.eclipse.cdt.dsf.debug.service.IRunControl.ISuspendedDMEvent; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.cdt.dsf.gdb.internal.ui.GdbUIPlugin; import org.eclipse.cdt.dsf.gdb.service.IGDBHardwareAndOS2; +import org.eclipse.cdt.dsf.gdb.service.IGDBHardwareAndOS2.IResourceClass; +import org.eclipse.cdt.dsf.gdb.service.IGDBHardwareAndOS2.IResourcesInformation; import org.eclipse.cdt.dsf.mi.service.IMIRunControl; import org.eclipse.cdt.dsf.service.DsfServiceEventHandler; import org.eclipse.cdt.dsf.service.DsfServicesTracker; @@ -48,7 +50,7 @@ public class SessionOSData { private IGDBHardwareAndOS2 fHardwareOs; private ICommandControlDMContext fContext; - private IGDBHardwareAndOS2.IResourceClass[] fResourceClasses = new IGDBHardwareAndOS2.IResourceClass[0]; + private IResourceClass[] fResourceClasses = new IResourceClass[0]; private Map fExistingData = new HashMap(); private Map fTimestamp = new HashMap(); @@ -100,7 +102,7 @@ public class SessionOSData { { fWaitingForSession = false; fFetchingClasses = true; - fHardwareOs.getResourceClasses(fContext, new DataRequestMonitor(fSession.getExecutor(), null) { + fHardwareOs.getResourceClasses(fContext, new DataRequestMonitor(fSession.getExecutor(), null) { @Override @ConfinedToDsfExecutor("fExecutor") protected void handleCompleted() { @@ -145,7 +147,7 @@ public class SessionOSData { fTracker.dispose(); } - public IGDBHardwareAndOS2.IResourceClass[] getResourceClasses() + public IResourceClass[] getResourceClasses() { return fResourceClasses; } @@ -202,7 +204,7 @@ public class SessionOSData { @Override public void run() { - fHardwareOs.getResourcesInformation(fContext, resourceClass, new DataRequestMonitor(executor, null) { + fHardwareOs.getResourcesInformation(fContext, resourceClass, new DataRequestMonitor(executor, null) { @Override @ConfinedToDsfExecutor("fExecutor") diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIInfoOsInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIInfoOsInfo.java index 9c9f5191812..abb4337cc1d 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIInfoOsInfo.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIInfoOsInfo.java @@ -14,9 +14,8 @@ package org.eclipse.cdt.dsf.mi.service.command.output; import java.util.ArrayList; import java.util.List; -import org.eclipse.cdt.dsf.gdb.service.IGDBHardwareAndOS2; -import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo; -import org.eclipse.cdt.dsf.mi.service.command.output.MIOutput; +import org.eclipse.cdt.dsf.gdb.service.IGDBHardwareAndOS2.IResourceClass; +import org.eclipse.cdt.dsf.gdb.service.IGDBHardwareAndOS2.IResourcesInformation; /** * Example output: @@ -63,7 +62,7 @@ import org.eclipse.cdt.dsf.mi.service.command.output.MIOutput; public class MIInfoOsInfo extends MIInfo { // The fields below are used for response with list of classes. - private IGDBHardwareAndOS2.IResourceClass[] resourceClasses; + private IResourceClass[] resourceClasses; // The below fields are used only for data with specific resource class private String[] columnNames; @@ -79,9 +78,9 @@ public class MIInfoOsInfo extends MIInfo { } } - public IGDBHardwareAndOS2.IResourcesInformation getResourcesInformation() + public IResourcesInformation getResourcesInformation() { - return new IGDBHardwareAndOS2.IResourcesInformation() { + return new IResourcesInformation() { @Override public String[][] getContent() { return content; } @@ -91,14 +90,14 @@ public class MIInfoOsInfo extends MIInfo { }; } - public IGDBHardwareAndOS2.IResourceClass[] getResourceClasses() + public IResourceClass[] getResourceClasses() { return resourceClasses; } private void parseResourceClasses() { - List classes = new ArrayList(); + List classes = new ArrayList(); MITuple table = (MITuple)get(getMIOutput(), "OSDataTable"); //$NON-NLS-1$ @@ -109,7 +108,7 @@ public class MIInfoOsInfo extends MIInfo { final String id = getString(row.getMIResults()[0]); final String description = getString(row.getMIResults()[2]); - classes.add(new IGDBHardwareAndOS2.IResourceClass() { + classes.add(new IResourceClass() { @Override public String getId() { return id; } @@ -120,7 +119,7 @@ public class MIInfoOsInfo extends MIInfo { }); } - resourceClasses = classes.toArray(new IGDBHardwareAndOS2.IResourceClass[classes.size()]); + resourceClasses = classes.toArray(new IResourceClass[classes.size()]); } private void parseResourcesInformation()