diff options
author | Jonah Graham | 2018-11-20 16:20:42 +0000 |
---|---|---|
committer | Jonah Graham | 2018-11-22 21:47:02 +0000 |
commit | a923614c73274179d56e78d35d17aef149c23a03 (patch) | |
tree | 668905afc85ffbb08e42844f6abafbcf038f7e10 | |
parent | 170e654b4796bad1453ae85a427b97317d67a69a (diff) | |
download | org.eclipse.cdt-a923614c73274179d56e78d35d17aef149c23a03.tar.gz org.eclipse.cdt-a923614c73274179d56e78d35d17aef149c23a03.tar.xz org.eclipse.cdt-a923614c73274179d56e78d35d17aef149c23a03.zip |
Bug 540373: Cleanup: Organize Imports
This was done by selecting all projects in Eclipse then
Source -> Clean Up... -> choosing:
- Organize Imports
and completing the wizard
Change-Id: Ia7b305a4c967d0e6f4e8fb8c1041e7028b24006c
1652 files changed, 9186 insertions, 9071 deletions
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/ErrorParserManager.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/ErrorParserManager.java index f536e1b8ed9..0fae880cebd 100644 --- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/ErrorParserManager.java +++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/ErrorParserManager.java @@ -27,7 +27,9 @@ import java.util.Map; import java.util.Vector; import org.eclipse.cdt.autotools.core.AutotoolsPlugin; +import org.eclipse.cdt.core.IErrorParser; import org.eclipse.cdt.core.IErrorParser2; +import org.eclipse.cdt.core.IMarkerGenerator; import org.eclipse.cdt.core.ProblemMarkerInfo; import org.eclipse.cdt.internal.core.IErrorMarkeredOutputStream; import org.eclipse.cdt.utils.EFSExtensionManager; diff --git a/build/org.eclipse.cdt.core.autotools.core/src/org/eclipse/cdt/core/autotools/core/AutotoolsBuildConfigurationProvider.java b/build/org.eclipse.cdt.core.autotools.core/src/org/eclipse/cdt/core/autotools/core/AutotoolsBuildConfigurationProvider.java index 580b5788622..f43b3dcdd51 100644 --- a/build/org.eclipse.cdt.core.autotools.core/src/org/eclipse/cdt/core/autotools/core/AutotoolsBuildConfigurationProvider.java +++ b/build/org.eclipse.cdt.core.autotools.core/src/org/eclipse/cdt/core/autotools/core/AutotoolsBuildConfigurationProvider.java @@ -17,13 +17,13 @@ package org.eclipse.cdt.core.autotools.core; import java.util.HashMap; import java.util.Map; +import org.eclipse.cdt.core.autotools.core.internal.Activator; import org.eclipse.cdt.core.build.CBuildConfiguration; import org.eclipse.cdt.core.build.ICBuildConfiguration; import org.eclipse.cdt.core.build.ICBuildConfigurationManager; import org.eclipse.cdt.core.build.ICBuildConfigurationProvider; import org.eclipse.cdt.core.build.IToolChain; import org.eclipse.cdt.core.build.IToolChainManager; -import org.eclipse.cdt.core.autotools.core.internal.Activator; import org.eclipse.core.resources.IBuildConfiguration; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; diff --git a/build/org.eclipse.cdt.core.autotools.core/src/org/eclipse/cdt/core/autotools/core/AutotoolsNature.java b/build/org.eclipse.cdt.core.autotools.core/src/org/eclipse/cdt/core/autotools/core/AutotoolsNature.java index 3adff6ac28d..dd547e83164 100644 --- a/build/org.eclipse.cdt.core.autotools.core/src/org/eclipse/cdt/core/autotools/core/AutotoolsNature.java +++ b/build/org.eclipse.cdt.core.autotools.core/src/org/eclipse/cdt/core/autotools/core/AutotoolsNature.java @@ -14,8 +14,8 @@ package org.eclipse.cdt.core.autotools.core; -import org.eclipse.cdt.core.build.CBuilder; import org.eclipse.cdt.core.autotools.core.internal.Activator; +import org.eclipse.cdt.core.build.CBuilder; import org.eclipse.core.resources.ICommand; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; diff --git a/build/org.eclipse.cdt.core.autotools.core/src/org/eclipse/cdt/core/autotools/core/AutotoolsProjectGenerator.java b/build/org.eclipse.cdt.core.autotools.core/src/org/eclipse/cdt/core/autotools/core/AutotoolsProjectGenerator.java index 93144aec7e0..e433ddd086c 100644 --- a/build/org.eclipse.cdt.core.autotools.core/src/org/eclipse/cdt/core/autotools/core/AutotoolsProjectGenerator.java +++ b/build/org.eclipse.cdt.core.autotools.core/src/org/eclipse/cdt/core/autotools/core/AutotoolsProjectGenerator.java @@ -20,10 +20,10 @@ import java.util.Map; import org.eclipse.cdt.core.CCProjectNature; import org.eclipse.cdt.core.CProjectNature; +import org.eclipse.cdt.core.autotools.core.internal.Activator; import org.eclipse.cdt.core.build.CBuilder; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.IPathEntry; -import org.eclipse.cdt.core.autotools.core.internal.Activator; import org.eclipse.core.resources.ICommand; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/builder/tests/CDataProviderTests.java b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/builder/tests/CDataProviderTests.java index 317bc27071f..9c8f6df033d 100644 --- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/builder/tests/CDataProviderTests.java +++ b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/builder/tests/CDataProviderTests.java @@ -13,10 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.make.builder.tests; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.core.settings.model.ICProjectDescription; @@ -31,6 +27,10 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + public class CDataProviderTests extends TestCase { /** * @param name diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/builder/tests/StandardBuildTests.java b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/builder/tests/StandardBuildTests.java index e74885e7aa2..946608453a6 100644 --- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/builder/tests/StandardBuildTests.java +++ b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/builder/tests/StandardBuildTests.java @@ -14,10 +14,6 @@ *******************************************************************************/ package org.eclipse.cdt.make.builder.tests; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import java.io.IOException; import org.eclipse.cdt.core.CCProjectNature; @@ -39,6 +35,10 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + public class StandardBuildTests extends TestCase { private static final boolean OFF = false; private static final boolean ON = true; diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/AutomatedIntegrationSuite.java b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/AutomatedIntegrationSuite.java index 3a1b7ca9349..be00630f21a 100644 --- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/AutomatedIntegrationSuite.java +++ b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/AutomatedIntegrationSuite.java @@ -14,13 +14,13 @@ *******************************************************************************/ package org.eclipse.cdt.make.core.tests; +import org.eclipse.cdt.make.builder.tests.StandardBuildTests; +import org.eclipse.cdt.make.scannerdiscovery.ScannerDiscoveryTests; + import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.eclipse.cdt.make.builder.tests.StandardBuildTests; -import org.eclipse.cdt.make.scannerdiscovery.ScannerDiscoveryTests; - public class AutomatedIntegrationSuite extends TestSuite { public AutomatedIntegrationSuite() { diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/MakeTestsPlugin.java b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/MakeTestsPlugin.java index 70d678c3612..e9d67f59bfb 100644 --- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/MakeTestsPlugin.java +++ b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/MakeTestsPlugin.java @@ -13,9 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.make.core.tests; +import java.util.MissingResourceException; +import java.util.ResourceBundle; + import org.eclipse.core.runtime.Plugin; import org.osgi.framework.BundleContext; -import java.util.*; /** * The main plugin class to be used in the desktop. diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/MakefileReaderProviderTests.java b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/MakefileReaderProviderTests.java index c45672b3de4..1bfae57911a 100644 --- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/MakefileReaderProviderTests.java +++ b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/MakefileReaderProviderTests.java @@ -25,10 +25,6 @@ import java.net.MalformedURLException; import java.net.URI; import java.net.URL; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.make.core.MakeCorePlugin; import org.eclipse.cdt.make.core.makefile.IMacroDefinition; import org.eclipse.cdt.make.core.makefile.IMakefile; @@ -39,6 +35,10 @@ import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + public class MakefileReaderProviderTests extends TestCase { private String[] inclDirs; diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/StandardBuildTestHelper.java b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/StandardBuildTestHelper.java index 6f6eb308ec4..f45aa656278 100644 --- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/StandardBuildTestHelper.java +++ b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/StandardBuildTestHelper.java @@ -13,11 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.make.core.tests; -import java.io.File; import java.io.FileReader; -import java.io.FileWriter; - -import junit.framework.Assert; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.core.resources.IProject; @@ -34,6 +30,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; +import junit.framework.Assert; + public class StandardBuildTestHelper { /* (non-Javadoc) * Create a new project named <code>name</code> or return the project in diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/BaseBOPConsoleParserTests.java b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/BaseBOPConsoleParserTests.java index 1f52f2087b5..05420461a8e 100644 --- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/BaseBOPConsoleParserTests.java +++ b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/BaseBOPConsoleParserTests.java @@ -17,13 +17,13 @@ package org.eclipse.cdt.make.scannerdiscovery; import java.util.List; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector; import org.eclipse.cdt.make.core.scannerconfig.IScannerInfoConsoleParser; import org.eclipse.cdt.make.core.scannerconfig.ScannerInfoTypes; +import junit.framework.TestSuite; + /** * Scanner configuration console parser tests * diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCPerFileBOPConsoleParserTests.java b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCPerFileBOPConsoleParserTests.java index 00ea8ff8d66..76d5d99688d 100644 --- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCPerFileBOPConsoleParserTests.java +++ b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCPerFileBOPConsoleParserTests.java @@ -17,8 +17,6 @@ package org.eclipse.cdt.make.scannerdiscovery; import java.io.File; import java.util.List; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.IMarkerGenerator; import org.eclipse.cdt.core.ProblemMarkerInfo; import org.eclipse.cdt.core.model.ICProject; @@ -33,6 +31,8 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.Path; +import junit.framework.TestSuite; + public class GCCPerFileBOPConsoleParserTests extends BaseBOPConsoleParserTests { private final static IMarkerGenerator MARKER_GENERATOR = new IMarkerGenerator() { @Override diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCScannerInfoConsoleParserTests.java b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCScannerInfoConsoleParserTests.java index b1dec6e4dd9..7dba47183ef 100644 --- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCScannerInfoConsoleParserTests.java +++ b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCScannerInfoConsoleParserTests.java @@ -17,11 +17,11 @@ package org.eclipse.cdt.make.scannerdiscovery; import java.util.List; -import junit.framework.TestSuite; - import org.eclipse.cdt.make.core.scannerconfig.ScannerInfoTypes; import org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCScannerInfoConsoleParser; +import junit.framework.TestSuite; + /** * Scanner configuration console parser tests * diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeMessages.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeMessages.java index 5d154052fca..d6726852aee 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeMessages.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeMessages.java @@ -13,10 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.make.internal.core; -import com.ibm.icu.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; +import com.ibm.icu.text.MessageFormat; + public class MakeMessages { private static final String RESOURCE_BUNDLE = MakeMessages.class.getName(); diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/PreferenceInitializer.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/PreferenceInitializer.java index 31b5022031f..4be93c842bb 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/PreferenceInitializer.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/PreferenceInitializer.java @@ -15,8 +15,8 @@ package org.eclipse.cdt.make.internal.core; import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.make.core.IMakeCommonBuildInfo; import org.eclipse.cdt.make.core.IMakeBuilderInfo; +import org.eclipse.cdt.make.core.IMakeCommonBuildInfo; import org.eclipse.cdt.make.core.MakeBuilder; import org.eclipse.cdt.make.core.MakeCorePlugin; import org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo; diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/LogWriter.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/LogWriter.java index 6a90e090447..7501751c391 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/LogWriter.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/LogWriter.java @@ -20,13 +20,14 @@ import java.io.IOException; import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.Writer; -import com.ibm.icu.text.DateFormat; -import com.ibm.icu.text.SimpleDateFormat; import java.util.Date; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; +import com.ibm.icu.text.DateFormat; +import com.ibm.icu.text.SimpleDateFormat; + /** * Log writer utility * diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/actions/FoldingMessages.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/actions/FoldingMessages.java index 8d1bb6f8235..cf18a1f6ce0 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/actions/FoldingMessages.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/actions/FoldingMessages.java @@ -17,10 +17,11 @@ package org.eclipse.cdt.make.internal.ui.actions; -import com.ibm.icu.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; +import com.ibm.icu.text.MessageFormat; + /** * Class that gives access to the folding messages resource bundle. */ diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileToggleCommentAction.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileToggleCommentAction.java index 0f398f74d9d..eb31a60c991 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileToggleCommentAction.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileToggleCommentAction.java @@ -18,6 +18,7 @@ import java.util.HashMap; import java.util.Map; import java.util.ResourceBundle; +import org.eclipse.cdt.make.internal.ui.MakeUIPlugin; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; @@ -37,7 +38,6 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.ResourceAction; import org.eclipse.ui.texteditor.TextEditorAction; -import org.eclipse.cdt.make.internal.ui.MakeUIPlugin; /** * An action which toggles comment prefixes on the selected lines. diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/WizardCheckboxTablePart.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/WizardCheckboxTablePart.java index 755e85dbc78..db8f2a27ddd 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/WizardCheckboxTablePart.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/WizardCheckboxTablePart.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.make.internal.ui.part; -import com.ibm.icu.text.MessageFormat; - import org.eclipse.cdt.make.internal.ui.MakeUIPlugin; import org.eclipse.jface.viewers.CheckboxTableViewer; import org.eclipse.jface.viewers.StructuredViewer; @@ -24,6 +22,8 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; +import com.ibm.icu.text.MessageFormat; + /** * @version 1.0 */ diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/IWorkingCopyManager.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/IWorkingCopyManager.java index e22af906930..99f5c279fb4 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/IWorkingCopyManager.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/IWorkingCopyManager.java @@ -13,12 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.make.ui; +import org.eclipse.cdt.make.core.makefile.IMakefile; import org.eclipse.core.runtime.CoreException; - import org.eclipse.ui.IEditorInput; -import org.eclipse.cdt.make.core.makefile.IMakefile; - /** * Interface for accessing working copies of <code>IMakefile</code> * objects. The original unit is only given indirectly by means diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/IWorkingCopyManagerExtension.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/IWorkingCopyManagerExtension.java index 9c22ddff8a4..dbee9a6ee43 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/IWorkingCopyManagerExtension.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/IWorkingCopyManagerExtension.java @@ -14,9 +14,8 @@ package org.eclipse.cdt.make.ui; -import org.eclipse.ui.IEditorInput; - import org.eclipse.cdt.make.core.makefile.IMakefile; +import org.eclipse.ui.IEditorInput; /** * Extension interface for <code>IWorkingCopyManager</code>. diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/actions/BuildLastTargetAction.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/actions/BuildLastTargetAction.java index fd34b3ef1e7..8bf984e0bbb 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/actions/BuildLastTargetAction.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/actions/BuildLastTargetAction.java @@ -16,9 +16,9 @@ package org.eclipse.cdt.make.ui.actions; import org.eclipse.cdt.make.core.IMakeTarget; import org.eclipse.cdt.make.core.MakeCorePlugin; import org.eclipse.cdt.make.internal.ui.MakeUIPlugin; +import org.eclipse.cdt.make.internal.ui.preferences.MakePreferencePage; import org.eclipse.cdt.make.ui.TargetBuild; import org.eclipse.cdt.make.ui.dialogs.BuildTargetDialog; -import org.eclipse.cdt.make.internal.ui.preferences.MakePreferencePage; import org.eclipse.core.resources.IContainer; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/AddTargetAction.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/AddTargetAction.java index 4b378e74ab6..2c75c4cc418 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/AddTargetAction.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/AddTargetAction.java @@ -14,8 +14,8 @@ package org.eclipse.cdt.make.ui.views; import org.eclipse.cdt.make.core.IMakeTarget; -import org.eclipse.cdt.make.internal.ui.MakeUIPlugin; import org.eclipse.cdt.make.internal.ui.MakeUIImages; +import org.eclipse.cdt.make.internal.ui.MakeUIPlugin; import org.eclipse.cdt.make.internal.ui.dnd.MakeTargetDndUtil; import org.eclipse.cdt.make.ui.TargetSourceContainer; import org.eclipse.cdt.make.ui.dialogs.MakeTargetDialog; diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/BuildTargetAction.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/BuildTargetAction.java index 87aaf4322d3..19ba387d4c0 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/BuildTargetAction.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/BuildTargetAction.java @@ -16,8 +16,8 @@ package org.eclipse.cdt.make.ui.views; import java.util.List; import org.eclipse.cdt.make.core.IMakeTarget; -import org.eclipse.cdt.make.internal.ui.MakeUIPlugin; import org.eclipse.cdt.make.internal.ui.MakeUIImages; +import org.eclipse.cdt.make.internal.ui.MakeUIPlugin; import org.eclipse.cdt.make.ui.TargetBuild; import org.eclipse.core.resources.IContainer; import org.eclipse.core.runtime.CoreException; diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/EditTargetAction.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/EditTargetAction.java index c734cee685d..3766c7b8c0c 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/EditTargetAction.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/EditTargetAction.java @@ -16,8 +16,8 @@ package org.eclipse.cdt.make.ui.views; import java.util.List; import org.eclipse.cdt.make.core.IMakeTarget; -import org.eclipse.cdt.make.internal.ui.MakeUIPlugin; import org.eclipse.cdt.make.internal.ui.MakeUIImages; +import org.eclipse.cdt.make.internal.ui.MakeUIPlugin; import org.eclipse.cdt.make.ui.dialogs.MakeTargetDialog; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.viewers.IStructuredSelection; diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/FilterEmtpyFoldersAction.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/FilterEmtpyFoldersAction.java index 72eca1488c7..91f01ded803 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/FilterEmtpyFoldersAction.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/FilterEmtpyFoldersAction.java @@ -17,8 +17,8 @@ package org.eclipse.cdt.make.ui.views; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.make.core.IMakeTarget; import org.eclipse.cdt.make.core.MakeCorePlugin; -import org.eclipse.cdt.make.internal.ui.MakeUIPlugin; import org.eclipse.cdt.make.internal.ui.MakeUIImages; +import org.eclipse.cdt.make.internal.ui.MakeUIPlugin; import org.eclipse.cdt.make.ui.MakeContentProvider; import org.eclipse.cdt.make.ui.TargetSourceContainer; import org.eclipse.core.resources.IContainer; diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/wizards/UpdateMakeProjectWizard.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/wizards/UpdateMakeProjectWizard.java index 8d39a12dfc1..e6aa2e2ddde 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/wizards/UpdateMakeProjectWizard.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/wizards/UpdateMakeProjectWizard.java @@ -14,7 +14,7 @@ package org.eclipse.cdt.make.ui.wizards; import org.eclipse.cdt.make.internal.ui.MakeUIPlugin; -import org.eclipse.cdt.make.ui.actions.*; +import org.eclipse.cdt.make.ui.actions.UpdateMakeProjectAction; import org.eclipse.core.resources.IProject; import org.eclipse.jface.wizard.Wizard; diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/AbstractBuilderTest.java b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/AbstractBuilderTest.java index 7a6162a806f..72c1cdda6f5 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/AbstractBuilderTest.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/AbstractBuilderTest.java @@ -20,8 +20,6 @@ import java.util.Collection; import java.util.LinkedHashSet; import java.util.List; -import junit.framework.TestCase; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICModelMarker; @@ -45,6 +43,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.jobs.Job; +import junit.framework.TestCase; + /** * Abstract builder test which provides utility methods for: * <ul> diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/BuildSystemTestHelper.java b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/BuildSystemTestHelper.java index 521518fd725..80c2254a1f5 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/BuildSystemTestHelper.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/BuildSystemTestHelper.java @@ -17,8 +17,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.LinkedHashSet; -import junit.framework.Assert; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.settings.model.ICProjectDescription; @@ -42,6 +40,8 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; +import junit.framework.Assert; + public class BuildSystemTestHelper { static public IProject createProject(String name, IPath location, String projTypeId) throws CoreException { diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/ManagedBuildTestHelper.java b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/ManagedBuildTestHelper.java index 40fc3058b57..663709246fd 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/ManagedBuildTestHelper.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/ManagedBuildTestHelper.java @@ -29,9 +29,6 @@ import java.util.Set; import java.util.TreeSet; import java.util.zip.ZipFile; -import junit.framework.Assert; -import junit.framework.TestCase; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.ICDescriptor; import org.eclipse.cdt.core.model.ICProject; @@ -76,6 +73,9 @@ import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider; import org.eclipse.ui.wizards.datatransfer.ImportOperation; import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider; +import junit.framework.Assert; +import junit.framework.TestCase; + public class ManagedBuildTestHelper { private static final String rcbsToolId = "org.eclipse.cdt.managedbuilder.ui.rcbs"; //$NON-NLS-1$ private static final String rcbsToolName = "Resource Custom Build Step"; //$NON-NLS-1$ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/ResourceDeltaVerifier.java b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/ResourceDeltaVerifier.java index 23257d41e11..aaf764f598b 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/ResourceDeltaVerifier.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/ResourceDeltaVerifier.java @@ -20,8 +20,6 @@ import java.util.HashSet; import java.util.Hashtable; import java.util.Set; -import junit.framework.Assert; - import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceChangeEvent; @@ -31,6 +29,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; +import junit.framework.Assert; + /** * Based on org.eclipse.core.tests.resources.ResourceDeltaVerifier with * additional support for ignoring changes in certain resources. diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AutomatedIntegrationSuite.java b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AutomatedIntegrationSuite.java index 60af1768410..9be71132fd4 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AutomatedIntegrationSuite.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AutomatedIntegrationSuite.java @@ -15,9 +15,6 @@ *******************************************************************************/ package org.eclipse.cdt.managedbuilder.tests.suite; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.cdt.build.core.scannerconfig.tests.CfgScannerConfigProfileManagerTests; import org.eclipse.cdt.build.core.scannerconfig.tests.GCCSpecsConsoleParserTest; import org.eclipse.cdt.core.CCorePlugin; @@ -49,6 +46,9 @@ import org.eclipse.cdt.projectmodel.tests.CProjectDescriptionSerializationTests; import org.eclipse.cdt.projectmodel.tests.OptionStringListValueTests; import org.eclipse.cdt.projectmodel.tests.ProjectModelTests; +import junit.framework.Test; +import junit.framework.TestSuite; + /** * Main TestSuite for all the managed build tests */ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/Preconditions.java b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/Preconditions.java index dd2dde8d59c..5854f0ae7e7 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/Preconditions.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/Preconditions.java @@ -17,8 +17,6 @@ import java.util.Arrays; import java.util.Set; import java.util.TreeSet; -import junit.framework.TestCase; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.utils.PathUtil; import org.eclipse.core.runtime.IPath; @@ -26,6 +24,8 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.content.IContentType; import org.eclipse.core.runtime.content.IContentTypeManager; +import junit.framework.TestCase; + public class Preconditions extends TestCase { @Override protected void setUp() throws Exception { diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/build/core/scannerconfig/tests/CfgScannerConfigProfileManagerTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/build/core/scannerconfig/tests/CfgScannerConfigProfileManagerTests.java index da0e4002476..a2e09593c3b 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/build/core/scannerconfig/tests/CfgScannerConfigProfileManagerTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/build/core/scannerconfig/tests/CfgScannerConfigProfileManagerTests.java @@ -15,9 +15,6 @@ package org.eclipse.cdt.build.core.scannerconfig.tests; import java.util.Map; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.cdt.build.core.scannerconfig.CfgInfoContext; import org.eclipse.cdt.build.core.scannerconfig.ICfgScannerConfigBuilderInfo2Set; import org.eclipse.cdt.build.internal.core.scannerconfig2.CfgScannerConfigProfileManager; @@ -35,6 +32,9 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; +import junit.framework.Test; +import junit.framework.TestSuite; + public class CfgScannerConfigProfileManagerTests extends BaseTestCase { IProject fProject; diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/build/core/scannerconfig/tests/GCCSpecsConsoleParserTest.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/build/core/scannerconfig/tests/GCCSpecsConsoleParserTest.java index f0600fbbb5c..5549ebd308d 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/build/core/scannerconfig/tests/GCCSpecsConsoleParserTest.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/build/core/scannerconfig/tests/GCCSpecsConsoleParserTest.java @@ -16,12 +16,12 @@ package org.eclipse.cdt.build.core.scannerconfig.tests; import java.util.List; import java.util.Map; -import junit.framework.TestCase; - import org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector; import org.eclipse.cdt.make.core.scannerconfig.ScannerInfoTypes; import org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCSpecsConsoleParser; +import junit.framework.TestCase; + public class GCCSpecsConsoleParserTest extends TestCase { GCCSpecsConsoleParser parser; private IScannerInfoCollector collector; diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/RegressionTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/RegressionTests.java index 1b2cc280f58..026d1055d7f 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/RegressionTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/RegressionTests.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.managedbuilder.core.regressions; -import org.eclipse.cdt.managedbuilder.core.regressions.Bug_303953; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/BuildDescriptionModelTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/BuildDescriptionModelTests.java index dd9d0507819..477fe72da38 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/BuildDescriptionModelTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/BuildDescriptionModelTests.java @@ -22,10 +22,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.CCProjectNature; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMManager; @@ -67,6 +63,10 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + public class BuildDescriptionModelTests extends TestCase { private static final String PREFIX = "BuildDescription_"; private static final String PROJ_PATH = "testBuildDescriptionProjects"; diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/BuildSystem40Tests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/BuildSystem40Tests.java index cd7404d2bc1..094e294abee 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/BuildSystem40Tests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/BuildSystem40Tests.java @@ -19,10 +19,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.settings.model.CIncludePathEntry; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; @@ -51,6 +47,10 @@ import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + public class BuildSystem40Tests extends TestCase { private IPath resourcesLocation = new Path( CTestPlugin.getFileInPlugin(new Path("resources/test40Projects/")).getAbsolutePath()); diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests.java index ed410f082bb..5c88395fcb6 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests.java @@ -17,10 +17,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.managedbuilder.core.BuildException; import org.eclipse.cdt.managedbuilder.core.IBuilder; import org.eclipse.cdt.managedbuilder.core.IConfiguration; @@ -37,6 +33,10 @@ import org.eclipse.cdt.managedbuilder.internal.core.Builder; import org.eclipse.core.runtime.IConfigurationElement; import org.junit.Assert; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + public class ManagedBuildCoreTests extends TestCase { private static IProjectType exeType; private static IProjectType libType; diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests20.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests20.java index 9bd87b4b988..644bdbdcd3e 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests20.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests20.java @@ -18,10 +18,6 @@ import java.util.Arrays; import java.util.Map; import java.util.Properties; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.parser.IScannerInfo; import org.eclipse.cdt.core.parser.IScannerInfoChangeListener; @@ -60,6 +56,10 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /* * These tests exercise CDT 2.0 manifest file functionality */ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests_SharedToolOptions.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests_SharedToolOptions.java index 0e732e381fa..ff8afb403b1 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests_SharedToolOptions.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests_SharedToolOptions.java @@ -15,10 +15,6 @@ package org.eclipse.cdt.managedbuilder.core.tests; import java.net.URL; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.testplugin.ResourceHelper; import org.eclipse.cdt.managedbuilder.core.IConfiguration; @@ -49,6 +45,10 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + // TODO LK - write test for resource configurations + IOptionCategory.getOptions(config) // TODO LK - write tests for EVENT_OPEN call-backs // TODO LK - do not deprecate IOption.getParent() as suggested by Leo diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildDependencyCalculatorTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildDependencyCalculatorTests.java index 3ffc98d6706..aab03ada0a9 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildDependencyCalculatorTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildDependencyCalculatorTests.java @@ -22,10 +22,6 @@ import java.io.File; import java.io.FileFilter; import java.util.ArrayList; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo; import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; import org.eclipse.cdt.managedbuilder.projectconverter.UpdateManagedProjectManager; @@ -39,6 +35,10 @@ import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Path; import org.eclipse.ui.dialogs.IOverwriteQuery; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + public class ManagedBuildDependencyCalculatorTests extends TestCase { private IPath resourcesLocation = new Path( CTestPlugin.getFileInPlugin(new Path("resources/depCalcProjects/")).getAbsolutePath()); diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildDependencyLibsTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildDependencyLibsTests.java index 45fff4c9320..f767c5bb99f 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildDependencyLibsTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildDependencyLibsTests.java @@ -16,9 +16,6 @@ package org.eclipse.cdt.managedbuilder.core.tests; import java.util.ArrayList; import java.util.List; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.settings.model.ICProjectDescription; import org.eclipse.cdt.managedbuilder.core.IBuilder; @@ -44,6 +41,9 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; +import junit.framework.Test; +import junit.framework.TestSuite; + public class ManagedBuildDependencyLibsTests extends AbstractBuilderTest { private static final String PROJ_PATH = "depLibsProjects"; private static final String MESSAGE_TAIL = " (see .log file for more details)."; diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildEnvironmentTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildEnvironmentTests.java index c351328d52a..6b707506294 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildEnvironmentTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildEnvironmentTests.java @@ -14,10 +14,6 @@ package org.eclipse.cdt.managedbuilder.core.tests; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.testplugin.ResourceHelper; import org.eclipse.cdt.managedbuilder.core.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IManagedProject; @@ -28,6 +24,10 @@ import org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IWorkspace; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * * */ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildMacrosTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildMacrosTests.java index 50c95e4d0e3..ab280c43405 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildMacrosTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildMacrosTests.java @@ -19,10 +19,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.ICDescriptor; import org.eclipse.cdt.core.testplugin.ResourceHelper; @@ -50,6 +46,10 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + public class ManagedBuildMacrosTests extends TestCase { static IProject proj = null; static IManagedProject mproj = null; diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildTCSupportedTest.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildTCSupportedTest.java index 22519bf8d28..6d01beeb53b 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildTCSupportedTest.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildTCSupportedTest.java @@ -14,16 +14,16 @@ package org.eclipse.cdt.managedbuilder.core.tests; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.testplugin.ResourceHelper; import org.eclipse.cdt.managedbuilder.core.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IManagedProject; import org.eclipse.cdt.managedbuilder.core.IProjectType; import org.eclipse.cdt.managedbuilder.core.IToolChain; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * * */ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedCommandLineGeneratorTest.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedCommandLineGeneratorTest.java index a67800525ca..7d559a3222d 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedCommandLineGeneratorTest.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedCommandLineGeneratorTest.java @@ -16,24 +16,24 @@ package org.eclipse.cdt.managedbuilder.core.tests; import java.util.ArrayList; -import junit.framework.TestCase; -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo; -import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; -import org.eclipse.cdt.managedbuilder.core.IProjectType; import org.eclipse.cdt.managedbuilder.core.IConfiguration; -import org.eclipse.cdt.managedbuilder.core.ITool; -import org.eclipse.cdt.managedbuilder.core.IOption; +import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo; import org.eclipse.cdt.managedbuilder.core.IManagedCommandLineGenerator; import org.eclipse.cdt.managedbuilder.core.IManagedCommandLineInfo; +import org.eclipse.cdt.managedbuilder.core.IOption; +import org.eclipse.cdt.managedbuilder.core.IProjectType; +import org.eclipse.cdt.managedbuilder.core.ITool; +import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; import org.eclipse.cdt.managedbuilder.internal.core.ManagedCommandLineGenerator; import org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator; import org.eclipse.cdt.managedbuilder.testplugin.ManagedBuildTestHelper; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IPath; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + public class ManagedCommandLineGeneratorTest extends TestCase { private static String[] testCommandLinePatterns = { null, "${COMMAND}", "${COMMAND} ${FLAGS}", diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject21MakefileTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject21MakefileTests.java index 66170e96eab..780bb88ac8d 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject21MakefileTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject21MakefileTests.java @@ -26,10 +26,6 @@ import java.io.IOException; import java.nio.file.Files; import java.util.ArrayList; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo; import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; import org.eclipse.cdt.managedbuilder.projectconverter.UpdateManagedProjectManager; @@ -48,6 +44,10 @@ import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Path; import org.eclipse.ui.dialogs.IOverwriteQuery; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + public class ManagedProject21MakefileTests extends TestCase { private IPath resourcesLocation = new Path( CTestPlugin.getFileInPlugin(new Path("resources/test21Projects/")).getAbsolutePath()); diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProjectUpdateTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProjectUpdateTests.java index f68218cf81b..4a315af597e 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProjectUpdateTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProjectUpdateTests.java @@ -17,10 +17,6 @@ import java.io.File; import java.io.FileFilter; import java.util.ArrayList; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo; import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; import org.eclipse.cdt.managedbuilder.projectconverter.UpdateManagedProjectManager; @@ -41,6 +37,10 @@ import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.ui.dialogs.IOverwriteQuery; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + public class ManagedProjectUpdateTests extends TestCase { private IPath resourcesLocation = new Path( CTestPlugin.getFileInPlugin(new Path("resources/oldTypeProjects/")).getAbsolutePath()); diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/MultiVersionSupportTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/MultiVersionSupportTests.java index 48bf4ebe9d1..68e0781a146 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/MultiVersionSupportTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/MultiVersionSupportTests.java @@ -22,10 +22,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Map; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.ICDescriptor; import org.eclipse.cdt.managedbuilder.core.BuildException; @@ -53,6 +49,10 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.ui.dialogs.IOverwriteQuery; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + public class MultiVersionSupportTests extends TestCase { static IProject proj = null; static IManagedProject mproj = null; diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/OptionCategoryEnablementTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/OptionCategoryEnablementTests.java index 511633636d1..950157455cc 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/OptionCategoryEnablementTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/OptionCategoryEnablementTests.java @@ -13,10 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.managedbuilder.core.tests; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.managedbuilder.core.BuildException; import org.eclipse.cdt.managedbuilder.core.IBuildObject; import org.eclipse.cdt.managedbuilder.core.IConfiguration; @@ -34,6 +30,10 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + public class OptionCategoryEnablementTests extends TestCase { private static final String testName = "optcaten"; //$NON-NLS-1$ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/OptionEnablementTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/OptionEnablementTests.java index 2402629ad28..ff1db899e82 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/OptionEnablementTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/OptionEnablementTests.java @@ -13,10 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.managedbuilder.core.tests; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.settings.model.ICProjectDescription; import org.eclipse.cdt.managedbuilder.core.BuildException; @@ -38,6 +34,10 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + public class OptionEnablementTests extends TestCase implements IManagedOptionValueHandler, IOptionApplicability { private static final String PROJECT_TYPE = "test.four.dot.zero.cdt.managedbuild.target.gnu.exe"; private static final String CFG_NAME = "Test 4.0 ConfigName.Dbg"; diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/PathConverterTest.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/PathConverterTest.java index c0d35ee6090..b4483ac60b1 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/PathConverterTest.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/PathConverterTest.java @@ -11,10 +11,6 @@ package org.eclipse.cdt.managedbuilder.core.tests; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.model.IPathEntry; import org.eclipse.cdt.internal.core.model.IncludeEntry; import org.eclipse.cdt.managedbuilder.core.IConfiguration; @@ -29,6 +25,10 @@ import org.eclipse.cdt.managedbuilder.testplugin.ManagedBuildTestHelper; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IPath; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * This is a test for the pathConverter attribute * which may be specified for a tool or toolchain diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ToolChainModificationTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ToolChainModificationTests.java index 34f5c112b64..383fb842bcb 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ToolChainModificationTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ToolChainModificationTests.java @@ -19,10 +19,6 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.settings.model.ICProjectDescription; import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager; @@ -48,6 +44,10 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + public class ToolChainModificationTests extends TestCase { private static final String PROJ_NAME_PREFIX = "TCM_"; diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/templateengine/tests/TemplateEngineTestsHelper.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/templateengine/tests/TemplateEngineTestsHelper.java index e5e238ea04d..c643f3f60b9 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/templateengine/tests/TemplateEngineTestsHelper.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/templateengine/tests/TemplateEngineTestsHelper.java @@ -20,8 +20,6 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; -import junit.framework.TestCase; - import org.eclipse.cdt.core.templateengine.TemplateDescriptor; import org.eclipse.cdt.core.templateengine.TemplateEngine; import org.eclipse.cdt.managedbuilder.core.IConfiguration; @@ -40,6 +38,8 @@ import org.osgi.framework.Bundle; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; +import junit.framework.TestCase; + /** * * All supporting functions which are not part of Testing class. diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/templateengine/tests/TestProcesses.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/templateengine/tests/TestProcesses.java index 2c43c2a19c6..37710992b28 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/templateengine/tests/TestProcesses.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/templateengine/tests/TestProcesses.java @@ -17,8 +17,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import junit.framework.TestCase; - import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.templateengine.TemplateCore; import org.eclipse.cdt.core.templateengine.TemplateEngine; @@ -36,6 +34,8 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.NullProgressMonitor; +import junit.framework.TestCase; + public class TestProcesses extends TestCase { private static final String INCLUDE_FOLDER = "Include"; //$NON-NLS-1$ private static final String APPEND = "Append"; //$NON-NLS-1$ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/BackwardCompatiblityTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/BackwardCompatiblityTests.java index 2adefcd69c6..8f43cfa5acc 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/BackwardCompatiblityTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/BackwardCompatiblityTests.java @@ -17,10 +17,6 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.settings.model.ICProjectDescription; import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager; @@ -28,6 +24,10 @@ import org.eclipse.cdt.core.testplugin.ResourceHelper; import org.eclipse.cdt.managedbuilder.testplugin.ManagedBuildTestHelper; import org.eclipse.core.resources.IProject; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + public class BackwardCompatiblityTests extends TestCase { private static final String TEST_3X_STD_MAKE_PROJECTS = "test3xStdMakeProjects"; diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/CProjectDescriptionSerializationTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/CProjectDescriptionSerializationTests.java index 116632ff253..f7d2fb39c40 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/CProjectDescriptionSerializationTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/CProjectDescriptionSerializationTests.java @@ -13,11 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.projectmodel.tests; -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; @@ -47,6 +42,11 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.QualifiedName; +import junit.framework.Assert; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * Creates a project in a loop and checks that it is created with appropriate number * of build configurations diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/OptionStringListValueTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/OptionStringListValueTests.java index fac1c7cff64..0543f0fcdbe 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/OptionStringListValueTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/OptionStringListValueTests.java @@ -19,10 +19,6 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.settings.model.CIncludePathEntry; import org.eclipse.cdt.core.settings.model.CLibraryFileEntry; @@ -50,6 +46,10 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + public class OptionStringListValueTests extends TestCase { private static final String PROJ_NAME_PREFIX = "OptionStringListValueTests_"; diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/ProjectModelTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/ProjectModelTests.java index 7f33303e642..d930cda60c5 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/ProjectModelTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/ProjectModelTests.java @@ -19,10 +19,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ElementChangedEvent; @@ -70,6 +66,10 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + public class ProjectModelTests extends TestCase implements IElementChangedListener { private boolean isPrint = false; private CDefaultModelEventChecker fEventChecker; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ITool.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ITool.java index 6106974e4c5..c4cd22e506b 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ITool.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ITool.java @@ -15,11 +15,10 @@ package org.eclipse.cdt.managedbuilder.core; import java.util.List; -import org.eclipse.core.runtime.IPath; - import org.eclipse.cdt.core.settings.model.extension.CLanguageData; import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyGenerator; import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyGeneratorType; +import org.eclipse.core.runtime.IPath; /** * This interface represents a utility of some sort that is used in the build process. diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildModelMessages.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildModelMessages.java index 163e96da447..1c15980a3f0 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildModelMessages.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildModelMessages.java @@ -14,10 +14,11 @@ *******************************************************************************/ package org.eclipse.cdt.managedbuilder.internal.buildmodel; -import com.ibm.icu.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; +import com.ibm.icu.text.MessageFormat; + public class BuildModelMessages { private static final String BUNDLE_NAME = "org.eclipse.cdt.managedbuilder.internal.buildmodel.BuildModelMessages"; //$NON-NLS-1$ diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/ProcessLauncher.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/ProcessLauncher.java index 0dab38d1e84..7ff84919261 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/ProcessLauncher.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/ProcessLauncher.java @@ -13,7 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.managedbuilder.internal.buildmodel; -import java.io.*; +import java.io.File; +import java.io.IOException; +import java.io.OutputStream; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.internal.core.ProcessClosure; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HeadlessBuilder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HeadlessBuilder.java index 2a8d001a2bd..6897e6d621d 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HeadlessBuilder.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HeadlessBuilder.java @@ -58,14 +58,12 @@ import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin; import org.eclipse.core.filesystem.EFS; import org.eclipse.core.filesystem.IFileStore; import org.eclipse.core.filesystem.URIUtil; -import org.eclipse.core.resources.ICommand; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspaceDescription; import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedMakeMessages.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedMakeMessages.java index df62ea1a206..0380c9cf5fb 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedMakeMessages.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedMakeMessages.java @@ -13,10 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.managedbuilder.internal.core; -import com.ibm.icu.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; +import com.ibm.icu.text.MessageFormat; + /** * @since 2.0 */ diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/DataProviderMessages.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/DataProviderMessages.java index 8fdd38502d3..372edb43ed4 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/DataProviderMessages.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/DataProviderMessages.java @@ -13,10 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.managedbuilder.internal.dataprovider; -import com.ibm.icu.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; +import com.ibm.icu.text.MessageFormat; + public class DataProviderMessages { private static final String BUNDLE_NAME = "org.eclipse.cdt.managedbuilder.internal.dataprovider.DataProviderMessages"; //$NON-NLS-1$ diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/IManagedDependencyGenerator2.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/IManagedDependencyGenerator2.java index ed384967cbb..86e1ff16da6 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/IManagedDependencyGenerator2.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/IManagedDependencyGenerator2.java @@ -16,9 +16,9 @@ package org.eclipse.cdt.managedbuilder.makegen; import org.eclipse.cdt.managedbuilder.core.IBuildObject; import org.eclipse.cdt.managedbuilder.core.IConfiguration; +import org.eclipse.cdt.managedbuilder.core.ITool; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IPath; -import org.eclipse.cdt.managedbuilder.core.ITool; /** * @since 3.1 diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/ConverterMessages.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/ConverterMessages.java index 3915ab8163d..6f446c40b0a 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/ConverterMessages.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/ConverterMessages.java @@ -13,10 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.managedbuilder.projectconverter; -import com.ibm.icu.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; +import com.ibm.icu.text.MessageFormat; + /** * @noextend This class is not intended to be subclassed by clients. * @noinstantiate This class is not intended to be instantiated by clients. diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/internal/core/MakeMessages.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/internal/core/MakeMessages.java index 308a691dbf5..ebf7b2ba9c1 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/internal/core/MakeMessages.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/internal/core/MakeMessages.java @@ -13,10 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.newmake.internal.core; -import com.ibm.icu.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; +import com.ibm.icu.text.MessageFormat; + public class MakeMessages { private static final String RESOURCE_BUNDLE = MakeMessages.class.getName(); diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/ui/GnuUIPlugin.java b/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/ui/GnuUIPlugin.java index 91d30cdaf00..bf42ae41653 100644 --- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/ui/GnuUIPlugin.java +++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/ui/GnuUIPlugin.java @@ -14,11 +14,13 @@ package org.eclipse.cdt.managedbuilder.gnu.ui; +import java.util.MissingResourceException; +import java.util.ResourceBundle; + import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Plugin; import org.eclipse.core.runtime.Status; import org.osgi.framework.BundleContext; -import java.util.*; /** * The main plugin class to be used in the desktop. diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/suite/AutomatedIntegrationSuite.java b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/suite/AutomatedIntegrationSuite.java index 7a51e275596..11c0596e842 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/suite/AutomatedIntegrationSuite.java +++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/suite/AutomatedIntegrationSuite.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.managedbuilder.ui.tests.suite; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.cdt.managedbuilder.ui.tests.TestCProjectPlatformPage; import org.eclipse.cdt.managedbuilder.ui.tests.TestCustomPageManager; import org.eclipse.cdt.managedbuilder.ui.tests.properties.ToolListContentProviderTests; +import junit.framework.Test; +import junit.framework.TestSuite; + /** * */ diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/testplugin/TestsPlugin.java b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/testplugin/TestsPlugin.java index a7fab869c54..3530f2a96ea 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/testplugin/TestsPlugin.java +++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/testplugin/TestsPlugin.java @@ -14,10 +14,12 @@ package org.eclipse.cdt.managedbuilder.ui.tests.testplugin; -import org.eclipse.ui.plugin.*; +import java.util.MissingResourceException; +import java.util.ResourceBundle; + import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; -import java.util.*; /** * The main plugin class to be used in the desktop. diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_NewCDTProject.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_NewCDTProject.java index 71d90b4cf50..1b1b0ccfd43 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_NewCDTProject.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_NewCDTProject.java @@ -18,9 +18,9 @@ import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.core.settings.model.ICResourceDescription; import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; +import org.eclipse.cdt.managedbuilder.internal.ui.Messages; import org.eclipse.cdt.ui.newui.AbstractPrefPage; import org.eclipse.cdt.ui.newui.ICPropertyTab; -import org.eclipse.cdt.managedbuilder.internal.ui.Messages; import org.eclipse.core.runtime.CoreException; /** diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_PropertyPage.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_PropertyPage.java index e0ca3b5e7ce..6296a3328ea 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_PropertyPage.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_PropertyPage.java @@ -15,9 +15,9 @@ package org.eclipse.cdt.managedbuilder.ui.preferences; import org.eclipse.cdt.core.settings.model.ICResourceDescription; +import org.eclipse.cdt.managedbuilder.internal.ui.Messages; import org.eclipse.cdt.ui.newui.AbstractPrefPage; import org.eclipse.cdt.ui.newui.ICPropertyTab; -import org.eclipse.cdt.managedbuilder.internal.ui.Messages; /** * @since 5.1 diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PropertyMultiCfgTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PropertyMultiCfgTab.java index 4d42b0774ae..782d663423c 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PropertyMultiCfgTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PropertyMultiCfgTab.java @@ -14,9 +14,9 @@ package org.eclipse.cdt.managedbuilder.ui.preferences; import org.eclipse.cdt.core.settings.model.ICResourceDescription; +import org.eclipse.cdt.managedbuilder.internal.ui.Messages; import org.eclipse.cdt.ui.newui.AbstractCPropertyTab; import org.eclipse.cdt.ui.newui.CDTPrefUtil; -import org.eclipse.cdt.managedbuilder.internal.ui.Messages; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsUI.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsUI.java index ed323b33919..287e7c0cbe7 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsUI.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsUI.java @@ -48,13 +48,13 @@ import org.eclipse.cdt.managedbuilder.internal.ui.Messages; import org.eclipse.cdt.managedbuilder.macros.BuildMacroException; import org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider; import org.eclipse.cdt.ui.newui.AbstractPage; +import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IExtensionPoint; -import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.Platform; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.TitleAreaDialog; -import org.eclipse.core.runtime.Platform; import org.eclipse.jface.preference.BooleanFieldEditor; import org.eclipse.jface.preference.DirectoryFieldEditor; import org.eclipse.jface.preference.FieldEditor; diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingUI.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingUI.java index 39e1b7b67c7..9d6c882df5f 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingUI.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingUI.java @@ -27,9 +27,9 @@ import org.eclipse.cdt.managedbuilder.core.IOption.ITreeRoot; import org.eclipse.cdt.managedbuilder.core.IResourceInfo; import org.eclipse.cdt.managedbuilder.core.ITool; import org.eclipse.cdt.managedbuilder.internal.core.MultiResourceInfo; +import org.eclipse.cdt.managedbuilder.internal.ui.Messages; import org.eclipse.cdt.ui.newui.AbstractCPropertyTab; import org.eclipse.cdt.ui.newui.MultiLineTextFieldEditor; -import org.eclipse.cdt.managedbuilder.internal.ui.Messages; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.preference.FieldEditor; import org.eclipse.jface.preference.StringFieldEditor; diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolListLabelProvider.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolListLabelProvider.java index 51d5bade618..d4a18ecb216 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolListLabelProvider.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolListLabelProvider.java @@ -18,10 +18,10 @@ import java.net.URL; import org.eclipse.cdt.managedbuilder.core.IOptionCategory; import org.eclipse.cdt.managedbuilder.core.ITool; import org.eclipse.cdt.managedbuilder.internal.ui.Messages; +import org.eclipse.core.runtime.Assert; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.core.runtime.Assert; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.graphics.Image; diff --git a/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/internal/meson/ui/NewMesonToolChainFilePage.java b/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/internal/meson/ui/NewMesonToolChainFilePage.java index 9567c0d9ec3..d2390bfbf59 100644 --- a/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/internal/meson/ui/NewMesonToolChainFilePage.java +++ b/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/internal/meson/ui/NewMesonToolChainFilePage.java @@ -18,9 +18,9 @@ import java.nio.file.Paths; import org.eclipse.cdt.core.build.ICBuildConfiguration; import org.eclipse.cdt.core.build.IToolChain; import org.eclipse.cdt.core.build.IToolChainManager; +import org.eclipse.cdt.meson.core.Activator; import org.eclipse.cdt.meson.core.IMesonToolChainFile; import org.eclipse.cdt.meson.core.IMesonToolChainManager; -import org.eclipse.cdt.meson.core.Activator; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.SWT; diff --git a/codan/org.eclipse.cdt.codan.checkers.ui.tests/src/org/eclipse/cdt/codan/checkers/ui/quickfix/QuickFixCreateNewClassTest.java b/codan/org.eclipse.cdt.codan.checkers.ui.tests/src/org/eclipse/cdt/codan/checkers/ui/quickfix/QuickFixCreateNewClassTest.java index de985b537c0..8262df67683 100644 --- a/codan/org.eclipse.cdt.codan.checkers.ui.tests/src/org/eclipse/cdt/codan/checkers/ui/quickfix/QuickFixCreateNewClassTest.java +++ b/codan/org.eclipse.cdt.codan.checkers.ui.tests/src/org/eclipse/cdt/codan/checkers/ui/quickfix/QuickFixCreateNewClassTest.java @@ -14,10 +14,19 @@ *******************************************************************************/ package org.eclipse.cdt.codan.checkers.ui.quickfix; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.function.Function; import org.eclipse.cdt.codan.internal.checkers.ui.quickfix.QuickFixCreateNewClass; import org.eclipse.cdt.codan.ui.AbstractCodanCMarkerResolution; +import org.eclipse.cdt.core.dom.ILinkage; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.core.resources.IMarker; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; @@ -26,13 +35,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import static org.mockito.Mockito.*; - -import java.util.function.Function; - -import org.eclipse.cdt.core.dom.ILinkage; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.ITranslationUnit; @RunWith(MockitoJUnitRunner.class) public class QuickFixCreateNewClassTest { diff --git a/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/cxx/externaltool/ArgsSeparatorTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/cxx/externaltool/ArgsSeparatorTest.java index a496abb8028..f803bf231f5 100644 --- a/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/cxx/externaltool/ArgsSeparatorTest.java +++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/cxx/externaltool/ArgsSeparatorTest.java @@ -14,6 +14,7 @@ package org.eclipse.cdt.codan.core.cxx.externaltool; import static org.junit.Assert.assertArrayEquals; + import junit.framework.TestCase; /** diff --git a/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanFastCxxAstTestCase.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanFastCxxAstTestCase.java index cf9254feac8..e49badb6579 100644 --- a/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanFastCxxAstTestCase.java +++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanFastCxxAstTestCase.java @@ -13,7 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.codan.core.tests; -import junit.framework.TestCase; +import java.io.IOException; +import java.util.ArrayList; import org.eclipse.cdt.codan.core.CodanRuntime; import org.eclipse.cdt.codan.core.model.IChecker; @@ -45,8 +46,7 @@ import org.eclipse.cdt.internal.core.dom.parser.c.GNUCSourceParser; import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; -import java.io.IOException; -import java.util.ArrayList; +import junit.framework.TestCase; /** * TODO: add description diff --git a/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanFastTestSuite.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanFastTestSuite.java index d57a102a9f5..d7821a1a1ea 100644 --- a/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanFastTestSuite.java +++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanFastTestSuite.java @@ -14,16 +14,16 @@ *******************************************************************************/ package org.eclipse.cdt.codan.core.tests; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.codan.core.cfg.ControlFlowGraphTest; import org.eclipse.cdt.codan.core.cxx.CxxAstUtilsTest; import org.eclipse.cdt.codan.core.param.BasicProblemPreferenceTest; import org.eclipse.cdt.codan.core.param.ListProblemPreferenceTest; import org.eclipse.cdt.codan.core.param.MapProblemPreferenceTest; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + public class CodanFastTestSuite extends TestSuite { public CodanFastTestSuite() { } diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/ICheckersRegistry.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/ICheckersRegistry.java index 246d5458dea..b63585960d3 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/ICheckersRegistry.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/ICheckersRegistry.java @@ -13,11 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.codan.core.model; -import org.eclipse.core.resources.IResource; - import java.util.Collection; import java.util.Iterator; +import org.eclipse.core.resources.IResource; + /** * This interface an API to add/remove checker and problems programmatically, * get problem profiles and change problem default settings diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CheckersRegistry.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CheckersRegistry.java index c49e47126bc..7d50dd60b81 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CheckersRegistry.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CheckersRegistry.java @@ -14,6 +14,13 @@ *******************************************************************************/ package org.eclipse.cdt.codan.internal.core; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + import org.eclipse.cdt.codan.core.CodanCorePlugin; import org.eclipse.cdt.codan.core.PreferenceConstants; import org.eclipse.cdt.codan.core.model.AbstractCheckerWithProblemPreferences; @@ -43,13 +50,6 @@ import org.eclipse.core.runtime.preferences.DefaultScope; import org.eclipse.core.runtime.preferences.InstanceScope; import org.osgi.service.prefs.Preferences; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - /** * Implementation of checker registry interface */ diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/DecisionNode.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/DecisionNode.java index aff7455f3bc..a55a59ba23c 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/DecisionNode.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/DecisionNode.java @@ -13,14 +13,14 @@ *******************************************************************************/ package org.eclipse.cdt.codan.internal.core.cfg; +import java.util.ArrayList; +import java.util.List; + import org.eclipse.cdt.codan.core.model.cfg.IBasicBlock; import org.eclipse.cdt.codan.core.model.cfg.IBranchNode; import org.eclipse.cdt.codan.core.model.cfg.IConnectorNode; import org.eclipse.cdt.codan.core.model.cfg.IDecisionNode; -import java.util.ArrayList; -import java.util.List; - /** * @see IDecisionNode */ diff --git a/codan/org.eclipse.cdt.codan.ui.cfgview/src/org/eclipse/cdt/codan/ui/cfgview/views/ControlFlowGraphView.java b/codan/org.eclipse.cdt.codan.ui.cfgview/src/org/eclipse/cdt/codan/ui/cfgview/views/ControlFlowGraphView.java index 118d5037177..5f2b8356962 100644 --- a/codan/org.eclipse.cdt.codan.ui.cfgview/src/org/eclipse/cdt/codan/ui/cfgview/views/ControlFlowGraphView.java +++ b/codan/org.eclipse.cdt.codan.ui.cfgview/src/org/eclipse/cdt/codan/ui/cfgview/views/ControlFlowGraphView.java @@ -34,7 +34,6 @@ import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition; import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; - import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.model.ITranslationUnit; diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/cdescriptor/tests/CDescriptorOldTests.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/cdescriptor/tests/CDescriptorOldTests.java index 06c5f2130d7..aab755134e9 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/cdescriptor/tests/CDescriptorOldTests.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/cdescriptor/tests/CDescriptorOldTests.java @@ -16,12 +16,6 @@ package org.eclipse.cdt.core.cdescriptor.tests; -import junit.extensions.TestSetup; -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CDescriptorEvent; import org.eclipse.cdt.core.CProjectNature; @@ -43,6 +37,12 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import junit.extensions.TestSetup; +import junit.framework.Assert; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * This class exists because the tests in CDescriptorTests * are not fixed. diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/cdescriptor/tests/CDescriptorTests.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/cdescriptor/tests/CDescriptorTests.java index 93cb50ddf25..8c8b42f6f05 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/cdescriptor/tests/CDescriptorTests.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/cdescriptor/tests/CDescriptorTests.java @@ -21,9 +21,6 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CDescriptorEvent; import org.eclipse.cdt.core.CProjectNature; @@ -47,6 +44,9 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.junit.Assert; +import junit.framework.Test; +import junit.framework.TestSuite; + public class CDescriptorTests extends BaseTestCase { static String projectId = CTestPlugin.PLUGIN_ID + ".TestProject"; static IProject fProject; diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/envvar/IEnvironmentVariableManagerTests.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/envvar/IEnvironmentVariableManagerTests.java index 031650d4400..9f7e82fc994 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/envvar/IEnvironmentVariableManagerTests.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/envvar/IEnvironmentVariableManagerTests.java @@ -16,10 +16,6 @@ package org.eclipse.cdt.core.envvar; import java.io.ByteArrayInputStream; import java.util.Arrays; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; @@ -37,6 +33,10 @@ import org.eclipse.core.runtime.jobs.IJobManager; import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.core.runtime.jobs.Job; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + public class IEnvironmentVariableManagerTests extends TestCase { /** * Mock listener to listen to environment variable change events. diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/efsextension/tests/EFSExtensionTests.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/efsextension/tests/EFSExtensionTests.java index 45febb88d08..1f02826690e 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/efsextension/tests/EFSExtensionTests.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/efsextension/tests/EFSExtensionTests.java @@ -16,15 +16,15 @@ package org.eclipse.cdt.core.internal.efsextension.tests; import java.net.URI; import java.net.URISyntaxException; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.utils.EFSExtensionManager; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * Tests the EFSExtensionManager and EFSExtensionProvider classes, as well as the EFSExtensionProvider extension point. * diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserEfsFileMatchingTest.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserEfsFileMatchingTest.java index 2455514acc8..0286d70cad9 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserEfsFileMatchingTest.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserEfsFileMatchingTest.java @@ -18,10 +18,6 @@ import java.io.ByteArrayInputStream; import java.net.URI; import java.util.ArrayList; -import junit.framework.Assert; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.ErrorParserManager; import org.eclipse.cdt.core.IErrorParser; @@ -41,6 +37,10 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; +import junit.framework.Assert; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * The test case includes a few tests checking that {@link AbstractErrorParser}/{@link ErrorPattern} * properly locate and resolve filenames found in build output in case of EFS files/folders. diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserFileMatchingTest.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserFileMatchingTest.java index 246863aa110..32a588f5177 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserFileMatchingTest.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserFileMatchingTest.java @@ -18,10 +18,6 @@ package org.eclipse.cdt.core.internal.errorparsers.tests; import java.io.ByteArrayInputStream; import java.util.ArrayList; -import junit.framework.Assert; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.ErrorParserManager; import org.eclipse.cdt.core.IErrorParser; @@ -44,6 +40,10 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; +import junit.framework.Assert; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * The test case includes a few tests checking that {@link AbstractErrorParser}/{@link ErrorPattern} * properly locate and resolve filenames found in build output. diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/FileBasedErrorParserTests.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/FileBasedErrorParserTests.java index 4d26b3c947d..acc75426276 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/FileBasedErrorParserTests.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/FileBasedErrorParserTests.java @@ -18,12 +18,12 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.testplugin.CTestPlugin; import org.eclipse.core.runtime.Path; +import junit.framework.Test; +import junit.framework.TestSuite; + public class FileBasedErrorParserTests extends GenericErrorParserTests { File errorFile; diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/GenericErrorParserTests.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/GenericErrorParserTests.java index 1984e351158..c4e6282622b 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/GenericErrorParserTests.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/GenericErrorParserTests.java @@ -22,8 +22,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import junit.framework.TestCase; - import org.eclipse.cdt.core.ErrorParserManager; import org.eclipse.cdt.core.IMarkerGenerator; import org.eclipse.cdt.core.ProblemMarkerInfo; @@ -34,6 +32,8 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.NullProgressMonitor; +import junit.framework.TestCase; + /** * This test is designed to exercise the error parser capabilities. */ diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/MakeErrorParserTests.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/MakeErrorParserTests.java index d5f3263231f..779741c67d8 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/MakeErrorParserTests.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/MakeErrorParserTests.java @@ -15,11 +15,11 @@ package org.eclipse.cdt.core.internal.errorparsers.tests; import java.io.IOException; +import org.eclipse.cdt.core.ErrorParserManager; + import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.cdt.core.ErrorParserManager; - /** * This test is designed to exercise the error parser capabilities for GNU make. */ diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/RegexErrorParserTests.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/RegexErrorParserTests.java index aed5a8b40aa..68cb5cad54a 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/RegexErrorParserTests.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/RegexErrorParserTests.java @@ -16,9 +16,6 @@ package org.eclipse.cdt.core.internal.errorparsers.tests; import java.util.ArrayList; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.ErrorParserManager; import org.eclipse.cdt.core.IErrorParser; @@ -36,6 +33,9 @@ import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * Test cases testing RegexErrorParser functionality */ diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/PositionTrackerTests.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/PositionTrackerTests.java index 41e1523a329..6488e1cc2c7 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/PositionTrackerTests.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/PositionTrackerTests.java @@ -15,14 +15,14 @@ package org.eclipse.cdt.core.internal.tests; import java.util.Random; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.internal.core.PositionTracker; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.Region; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + public class PositionTrackerTests extends TestCase { public static Test suite() { return new TestSuite(PositionTrackerTests.class); diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/ResourceLookupTests.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/ResourceLookupTests.java index cdf539f90c8..4be8e614701 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/ResourceLookupTests.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/ResourceLookupTests.java @@ -19,9 +19,6 @@ import java.io.IOException; import java.io.InputStream; import java.net.URI; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.cdt.internal.core.resources.ResourceLookup; import org.eclipse.core.resources.IFile; @@ -34,6 +31,9 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; +import junit.framework.Test; +import junit.framework.TestSuite; + public class ResourceLookupTests extends BaseTestCase { public static Test suite() { return new TestSuite(ResourceLookupTests.class); diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryFileStore.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryFileStore.java index bbe8c1112dd..b8729c04675 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryFileStore.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryFileStore.java @@ -17,9 +17,14 @@ package org.eclipse.cdt.core.internal.tests.filesystem.ram; import java.io.InputStream; import java.io.OutputStream; import java.net.URI; -import org.eclipse.core.filesystem.*; + +import org.eclipse.core.filesystem.EFS; +import org.eclipse.core.filesystem.IFileInfo; +import org.eclipse.core.filesystem.IFileStore; import org.eclipse.core.filesystem.provider.FileStore; -import org.eclipse.core.runtime.*; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; /** * In memory file system implementation used for testing. diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryFileSystem.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryFileSystem.java index 7b2e4b56e19..c43502ea9a7 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryFileSystem.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryFileSystem.java @@ -16,6 +16,7 @@ package org.eclipse.cdt.core.internal.tests.filesystem.ram; import java.net.URI; import java.net.URISyntaxException; + import org.eclipse.core.filesystem.IFileStore; import org.eclipse.core.filesystem.provider.FileSystem; import org.eclipse.core.runtime.IPath; diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryTree.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryTree.java index 39a3904e97e..7245a2bb894 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryTree.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryTree.java @@ -14,8 +14,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.internal.tests.filesystem.ram; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.util.ArrayList; + import org.eclipse.core.filesystem.EFS; import org.eclipse.core.filesystem.IFileInfo; import org.eclipse.core.filesystem.provider.FileInfo; diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/Policy.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/Policy.java index 341f4d33f05..60b8563e156 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/Policy.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/Policy.java @@ -14,7 +14,9 @@ *******************************************************************************/ package org.eclipse.cdt.core.internal.tests.filesystem.ram; -import org.eclipse.core.runtime.*; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; /** * diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/resources/tests/RefreshScopeTests.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/resources/tests/RefreshScopeTests.java index a0e4d6e28c0..eb0861a06db 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/resources/tests/RefreshScopeTests.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/resources/tests/RefreshScopeTests.java @@ -19,10 +19,6 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.List; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CoreModel; @@ -49,6 +45,10 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * @author crecoskie * diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/utils/ByteUtilsTest.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/utils/ByteUtilsTest.java index 2d735c6685f..bc6aeaf3a21 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/utils/ByteUtilsTest.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/utils/ByteUtilsTest.java @@ -17,6 +17,7 @@ package org.eclipse.cdt.utils; import static org.eclipse.cdt.internal.core.ByteUtils.makeInt; import static org.eclipse.cdt.internal.core.ByteUtils.makeLong; import static org.eclipse.cdt.internal.core.ByteUtils.makeShort; + import junit.framework.Assert; import junit.framework.Test; import junit.framework.TestCase; diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/utils/FindProgramLocationTest.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/utils/FindProgramLocationTest.java index 8aa457cf7dc..22e57ce202d 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/utils/FindProgramLocationTest.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/utils/FindProgramLocationTest.java @@ -16,16 +16,16 @@ package org.eclipse.cdt.utils; import java.io.File; import java.io.IOException; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.testplugin.ResourceHelper; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + public class FindProgramLocationTest extends TestCase { private static final String PATH_SEPARATOR = File.pathSeparator; diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/utils/StorableCdtVariablesTest.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/utils/StorableCdtVariablesTest.java index b8c1b2d295a..75ff556d43b 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/utils/StorableCdtVariablesTest.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/utils/StorableCdtVariablesTest.java @@ -18,10 +18,6 @@ package org.eclipse.cdt.utils; import java.util.ArrayList; import java.util.List; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.cdtvariables.ICdtVariable; import org.eclipse.cdt.core.cdtvariables.IUserVarSupplier; @@ -32,6 +28,10 @@ import org.eclipse.cdt.core.testplugin.ResourceHelper; import org.eclipse.cdt.internal.core.cdtvariables.StorableCdtVariable; import org.eclipse.core.resources.IProject; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + public class StorableCdtVariablesTest extends TestCase { public static Test suite() { diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/utils/WeakHashSetTest.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/utils/WeakHashSetTest.java index f55d76183ff..f128e32bd64 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/utils/WeakHashSetTest.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/utils/WeakHashSetTest.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.utils; +import org.eclipse.cdt.internal.core.WeakHashSet; +import org.eclipse.cdt.internal.core.WeakHashSetSynchronized; + import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.eclipse.cdt.internal.core.WeakHashSet; -import org.eclipse.cdt.internal.core.WeakHashSetSynchronized; - /** * Test suite to test {@link WeakHashSet}. */ diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/LanguageInheritanceTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/LanguageInheritanceTests.java index 393c8fcf923..18323a5b0cf 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/LanguageInheritanceTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/LanguageInheritanceTests.java @@ -15,8 +15,6 @@ package org.eclipse.cdt.core.language; import java.util.Collections; -import junit.framework.Test; - import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.dom.ast.gnu.c.GCCLanguage; import org.eclipse.cdt.core.dom.ast.gnu.cpp.GPPLanguage; @@ -33,6 +31,8 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.content.IContentType; +import junit.framework.Test; + /** * Tests for language inheritance computations. */ diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsExtensionsTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsExtensionsTests.java index 5b197a63ee6..a3232678a00 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsExtensionsTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsExtensionsTests.java @@ -19,8 +19,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.settings.model.CIncludeFileEntry; import org.eclipse.cdt.core.settings.model.CIncludePathEntry; import org.eclipse.cdt.core.settings.model.CLibraryFileEntry; @@ -36,6 +34,8 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.Path; +import junit.framework.TestSuite; + /** * Test cases testing LanguageSettingsProvider extensions */ diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsListenersTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsListenersTests.java index e3a1883368f..858a4274b48 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsListenersTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsListenersTests.java @@ -18,8 +18,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.settings.model.CMacroEntry; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; @@ -35,6 +33,8 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.jobs.Job; +import junit.framework.TestSuite; + /** * Test cases to cover {@link ILanguageSettingsChangeListener} capabilities. */ diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsManagerTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsManagerTests.java index 3a0a89a5db8..83071da50c0 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsManagerTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsManagerTests.java @@ -17,8 +17,6 @@ package org.eclipse.cdt.core.language.settings.providers; import java.util.ArrayList; import java.util.List; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.AbstractExecutableExtensionBase; import org.eclipse.cdt.core.settings.model.CIncludeFileEntry; import org.eclipse.cdt.core.settings.model.CIncludePathEntry; @@ -41,6 +39,8 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.Path; +import junit.framework.TestSuite; + /** * Test cases testing {@link LanguageSettingsManager} utility methods. */ diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsPersistenceProjectTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsPersistenceProjectTests.java index 14fdba97190..682ef3dc6d7 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsPersistenceProjectTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsPersistenceProjectTests.java @@ -18,8 +18,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.settings.model.CIncludePathEntry; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; @@ -39,6 +37,8 @@ import org.eclipse.core.runtime.IPath; import org.w3c.dom.Document; import org.w3c.dom.Element; +import junit.framework.TestSuite; + /** * Test cases testing LanguageSettingsProvider functionality related to persistence. */ diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsProviderReferencedProjectsTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsProviderReferencedProjectsTests.java index d80b4cc9cff..dca7af1c990 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsProviderReferencedProjectsTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsProviderReferencedProjectsTests.java @@ -21,8 +21,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.settings.model.CIncludePathEntry; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; @@ -37,6 +35,8 @@ import org.eclipse.cdt.internal.core.language.settings.providers.ReferencedProje import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; +import junit.framework.TestSuite; + /** * Test cases testing ReferencedProjectsLanguageSettingsProvider functionality */ diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsScannerInfoProviderTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsScannerInfoProviderTests.java index 14b2ab751a3..3c6ac45f6d1 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsScannerInfoProviderTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsScannerInfoProviderTests.java @@ -18,8 +18,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.model.LanguageManager; import org.eclipse.cdt.core.parser.ExtendedScannerInfo; @@ -46,6 +44,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; +import junit.framework.TestSuite; + /** * Test cases testing LanguageSettingsProvider functionality */ diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsSerializableProviderTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsSerializableProviderTests.java index 8c2931961e6..115cbd80d0a 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsSerializableProviderTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsSerializableProviderTests.java @@ -17,8 +17,6 @@ package org.eclipse.cdt.core.language.settings.providers; import java.util.ArrayList; import java.util.List; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.settings.model.CIncludeFileEntry; import org.eclipse.cdt.core.settings.model.CIncludePathEntry; import org.eclipse.cdt.core.settings.model.CLibraryFileEntry; @@ -41,6 +39,8 @@ import org.eclipse.core.runtime.Path; import org.w3c.dom.Document; import org.w3c.dom.Element; +import junit.framework.TestSuite; + /** * Test cases testing serialization of LanguageSettingsProviders. */ diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ASTCacheTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ASTCacheTests.java index d972ca998c2..dd1b093405f 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ASTCacheTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ASTCacheTests.java @@ -14,9 +14,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.model.tests; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; @@ -39,6 +36,9 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; +import junit.framework.Test; +import junit.framework.TestSuite; + /** * Tests for the {@link ASTCache}. */ diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllCoreTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllCoreTests.java index 15565718ee4..9cd2ac2735f 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllCoreTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AllCoreTests.java @@ -14,13 +14,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.model.tests; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.language.settings.providers.AllLanguageSettingsProvidersCoreTests; import org.eclipse.cdt.core.settings.model.AllCProjectDescriptionTests; import org.eclipse.cdt.core.settings.model.PathSettingsContainerTests; +import junit.framework.Test; +import junit.framework.TestSuite; + /** * * AllTests.java diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ArchiveTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ArchiveTests.java index f905f2b9f16..541c4ad696e 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ArchiveTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ArchiveTests.java @@ -17,9 +17,6 @@ package org.eclipse.cdt.core.model.tests; import java.io.FileInputStream; import java.io.FileNotFoundException; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.IArchive; import org.eclipse.cdt.core.model.IBinary; @@ -36,6 +33,9 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * @author Peter Graves * diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AsmModelBuilderTest.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AsmModelBuilderTest.java index 3fd58284d7a..f05935b0c33 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AsmModelBuilderTest.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/AsmModelBuilderTest.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.model.tests; -import junit.framework.Test; - import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.IAsmLabel; import org.eclipse.cdt.core.model.ICElement; @@ -28,6 +26,8 @@ import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.CTestPlugin; import org.eclipse.cdt.core.testplugin.util.BaseTestCase; +import junit.framework.Test; + /** * Tests for the default assembly model builder. * diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/BinaryTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/BinaryTests.java index 28cfc8c0616..c1d5c0e7f22 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/BinaryTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/BinaryTests.java @@ -17,9 +17,6 @@ package org.eclipse.cdt.core.model.tests; import java.io.FileInputStream; import java.io.FileNotFoundException; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CModelException; @@ -40,6 +37,9 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * @author Peter Graves * diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/Bug311189.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/Bug311189.java index a91d000aaf2..4370373a8b0 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/Bug311189.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/Bug311189.java @@ -16,8 +16,6 @@ package org.eclipse.cdt.core.model.tests; import java.util.Arrays; -import junit.framework.Test; - import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.IPathEntry; import org.eclipse.cdt.core.resources.IPathEntryStore; @@ -33,6 +31,8 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.jobs.Job; +import junit.framework.Test; + /** * Regression test for Bug 311189. * When a Team Project Set is imported, replacing an existing CDT Project diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelBuilderBugsTest.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelBuilderBugsTest.java index 38b9e9df94f..7bd09401790 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelBuilderBugsTest.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelBuilderBugsTest.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.model.tests; -import junit.framework.Test; - import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; @@ -26,6 +24,8 @@ import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.CTestPlugin; import org.eclipse.cdt.core.testplugin.util.BaseTestCase; +import junit.framework.Test; + /** * Tests for C model builder bugs. */ diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelBuilderInactiveCodeTest.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelBuilderInactiveCodeTest.java index 17e4597a271..303e04bc78b 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelBuilderInactiveCodeTest.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelBuilderInactiveCodeTest.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.model.tests; -import junit.framework.Test; - import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.IInclude; @@ -25,6 +23,8 @@ import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.CTestPlugin; import org.eclipse.cdt.core.testplugin.util.BaseTestCase; +import junit.framework.Test; + /** * Tests for C model inactive code parsing. */ diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelElementsTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelElementsTests.java index 568980e01d2..00920e6bb1a 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelElementsTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelElementsTests.java @@ -17,9 +17,6 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.util.List; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CoreModel; @@ -55,6 +52,9 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; +import junit.framework.Test; +import junit.framework.TestSuite; + public class CModelElementsTests extends BaseTestCase { private ICProject fCProject; private IFile headerFile; diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelExceptionTest.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelExceptionTest.java index 4c547caa670..fb6573d788e 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelExceptionTest.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelExceptionTest.java @@ -14,14 +14,14 @@ package org.eclipse.cdt.core.model.tests; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.ICModelStatusConstants; import org.eclipse.cdt.internal.core.model.CModelStatus; import org.eclipse.core.runtime.CoreException; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * CModelExceptionTest * diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelIdentifierTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelIdentifierTests.java index 8dcf372aa3c..24f39c0dbba 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelIdentifierTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelIdentifierTests.java @@ -19,8 +19,6 @@ import java.io.FileNotFoundException; import java.util.ArrayList; import java.util.List; -import junit.framework.Test; - import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICElement; @@ -35,6 +33,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; +import junit.framework.Test; + /** * Tests for CModel identifier API. * diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java index 5e697161ddc..8cd92f7767f 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java @@ -20,9 +20,6 @@ import java.io.FileNotFoundException; import java.util.Arrays; import java.util.List; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.CCProjectNature; import org.eclipse.cdt.core.CProjectNature; import org.eclipse.cdt.core.dom.IPDOMManager; @@ -63,6 +60,9 @@ import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider; import org.eclipse.ui.wizards.datatransfer.ImportOperation; import org.osgi.framework.Bundle; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * This file contains a set of generic tests for the core C model. Nothing * exotic, but should be a small sanity set of tests. diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CPathEntryTest.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CPathEntryTest.java index 371cd15495a..119986250a0 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CPathEntryTest.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CPathEntryTest.java @@ -19,8 +19,6 @@ package org.eclipse.cdt.core.model.tests; import java.util.HashSet; import java.util.Set; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ElementChangedEvent; @@ -41,6 +39,8 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; +import junit.framework.TestSuite; + /* * CPathEntryTest */ diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/DeclaratorsTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/DeclaratorsTests.java index c3329c589e7..62f7a2da250 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/DeclaratorsTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/DeclaratorsTests.java @@ -17,9 +17,6 @@ */ package org.eclipse.cdt.core.model.tests; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.IFunction; @@ -28,6 +25,9 @@ import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.model.ITypeDef; import org.eclipse.cdt.core.model.IVariable; +import junit.framework.Test; +import junit.framework.TestSuite; + /** * @author bnicolle * diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ElementDeltaTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ElementDeltaTests.java index c76c9f57e79..3812ad83034 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ElementDeltaTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ElementDeltaTests.java @@ -18,10 +18,6 @@ import java.io.FileNotFoundException; import java.util.Iterator; import java.util.Vector; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CoreModel; @@ -42,6 +38,10 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * Class for testing the C Element Delta Builder. */ diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/FlagTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/FlagTests.java index 6c19496a57f..f24e6ac03d2 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/FlagTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/FlagTests.java @@ -13,12 +13,12 @@ *******************************************************************************/ package org.eclipse.cdt.core.model.tests; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.model.Flags; import org.eclipse.cdt.internal.core.model.IConstants; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * @author Peter Graves * diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IIncludeTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IIncludeTests.java index bfa67ddb55f..cb510076b93 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IIncludeTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IIncludeTests.java @@ -20,13 +20,13 @@ package org.eclipse.cdt.core.model.tests; import java.util.LinkedHashMap; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.IInclude; import org.eclipse.cdt.core.model.ITranslationUnit; +import junit.framework.Test; +import junit.framework.TestSuite; + /** * @author bnicolle * diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IMacroTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IMacroTests.java index ef9efde182d..a2d3f3cc554 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IMacroTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IMacroTests.java @@ -17,17 +17,16 @@ */ package org.eclipse.cdt.core.model.tests; +import java.util.List; + import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.IMacro; +import org.eclipse.cdt.core.model.ITranslationUnit; + import junit.framework.Test; import junit.framework.TestSuite; -import java.util.List; - -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.model.tests.IntegratedCModelTest; - /** * IMacroTest - Class for testing IMacro * diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IStructureTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IStructureTests.java index 228572df0d5..9dd04057e7a 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IStructureTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IStructureTests.java @@ -15,9 +15,6 @@ package org.eclipse.cdt.core.model.tests; import java.util.List; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.IField; @@ -26,6 +23,9 @@ import org.eclipse.cdt.core.model.IStructure; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; +import junit.framework.Test; +import junit.framework.TestSuite; + /** * @author bnicolle */ diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ITemplateTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ITemplateTests.java index 03dc60f103a..93ed3441633 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ITemplateTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ITemplateTests.java @@ -21,9 +21,6 @@ package org.eclipse.cdt.core.model.tests; import java.util.ArrayList; import java.util.List; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.IStructure; @@ -31,6 +28,9 @@ import org.eclipse.cdt.core.model.ITemplate; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.model.IVariable; +import junit.framework.Test; +import junit.framework.TestSuite; + /** * Class for testing ITemplate interface * @author bnicolle diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/MacroTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/MacroTests.java index 6f8a2b197f7..f50bfd03e08 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/MacroTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/MacroTests.java @@ -15,9 +15,6 @@ package org.eclipse.cdt.core.model.tests; import java.util.Stack; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.IBuffer; import org.eclipse.cdt.core.model.ICElement; @@ -28,6 +25,9 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.DefaultLineTracker; import org.eclipse.jface.text.ILineTracker; +import junit.framework.Test; +import junit.framework.TestSuite; + /** * @author bnicolle * diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralCModelElementsTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralCModelElementsTests.java index 71039b90a4f..74467897eb2 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralCModelElementsTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralCModelElementsTests.java @@ -17,9 +17,6 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.util.List; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CModelException; @@ -56,6 +53,9 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; +import junit.framework.Test; +import junit.framework.TestSuite; + public class StructuralCModelElementsTests extends BaseTestCase { private ICProject fCProject; private IFile headerFile; diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralMacroTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralMacroTests.java index 7ed0b3a36a8..98c5fb67c6e 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralMacroTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralMacroTests.java @@ -19,6 +19,7 @@ package org.eclipse.cdt.core.model.tests; */ import org.eclipse.cdt.core.model.CModelException; + import junit.framework.Test; import junit.framework.TestSuite; diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralStructureTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralStructureTests.java index 6b082a00f77..b48c782732e 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralStructureTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralStructureTests.java @@ -15,7 +15,8 @@ package org.eclipse.cdt.core.model.tests; import org.eclipse.cdt.core.model.CModelException; -import junit.framework.*; +import junit.framework.Test; +import junit.framework.TestSuite; /** * @author hamer diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralTemplateTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralTemplateTests.java index d4ed43f96bf..89cad9ae904 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralTemplateTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralTemplateTests.java @@ -16,14 +16,14 @@ package org.eclipse.cdt.core.model.tests; import java.util.ArrayList; import java.util.List; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ITemplate; import org.eclipse.cdt.core.model.ITranslationUnit; +import junit.framework.Test; +import junit.framework.TestSuite; + /** * @author hamer * diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitBaseTest.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitBaseTest.java index b760b41dde5..398ac110b33 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitBaseTest.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitBaseTest.java @@ -15,8 +15,6 @@ package org.eclipse.cdt.core.model.tests; import java.io.FileInputStream; -import junit.framework.TestCase; - import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.testplugin.CProjectHelper; @@ -30,6 +28,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; +import junit.framework.TestCase; + /** * @author jcamelon * diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitTests.java index d05e61e2d12..955989c44f7 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitTests.java @@ -17,8 +17,6 @@ import java.io.FileNotFoundException; import java.util.ArrayDeque; import java.util.Deque; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.IInclude; @@ -26,6 +24,8 @@ import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.util.ExpectedStrings; +import junit.framework.TestSuite; + /** * @author Peter Graves * diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/WorkingCopyTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/WorkingCopyTests.java index 5aacabecbd0..db8445b6ed7 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/WorkingCopyTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/WorkingCopyTests.java @@ -16,10 +16,6 @@ package org.eclipse.cdt.core.model.tests; import java.io.FileInputStream; import java.io.FileNotFoundException; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.IBuffer; @@ -34,6 +30,10 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * Contains unit test cases for Working Copies. Run using JUnit Plugin Test * configuration launcher. diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/BackwardCompatibilityTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/BackwardCompatibilityTests.java index d3572e7c14d..31e1ddd5b07 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/BackwardCompatibilityTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/BackwardCompatibilityTests.java @@ -19,8 +19,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.ICDescriptor; import org.eclipse.cdt.core.dom.IPDOMManager; @@ -34,6 +32,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; +import junit.framework.TestSuite; + public class BackwardCompatibilityTests extends BaseTestCase { private static final String PROJ_NAME_PREFIX = "BackwardCompatibilityTests_"; ICProject p1, p2, p3; diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CConfigurationDescriptionExportSettings.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CConfigurationDescriptionExportSettings.java index 85817cde9b0..09416a40c61 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CConfigurationDescriptionExportSettings.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CConfigurationDescriptionExportSettings.java @@ -22,8 +22,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.testplugin.ResourceHelper; import org.eclipse.cdt.core.testplugin.util.BaseTestCase; @@ -35,6 +33,8 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; +import junit.framework.TestSuite; + /** * Class for testing exported settings and project references. * This functionality is provided by the CfgExportSettingContainerFactory which plugins diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CConfigurationDescriptionReferenceTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CConfigurationDescriptionReferenceTests.java index 59d47048cbf..9a2987efbfb 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CConfigurationDescriptionReferenceTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CConfigurationDescriptionReferenceTests.java @@ -20,8 +20,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.CoreModelUtil; @@ -31,6 +29,8 @@ import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.core.runtime.CoreException; +import junit.framework.TestSuite; + /** * Test ICConfigurationDescription reference behaviours */ diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionBasicTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionBasicTests.java index 9ebdacf1418..e1cada41a7e 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionBasicTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionBasicTests.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.settings.model; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.CProjectNature; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CoreModel; @@ -33,6 +31,8 @@ import org.eclipse.core.runtime.QualifiedName; import org.eclipse.core.runtime.jobs.IJobManager; import org.eclipse.core.runtime.jobs.Job; +import junit.framework.TestSuite; + public class CProjectDescriptionBasicTests extends BaseTestCase { private static final String PROJ_NAME_PREFIX = "CProjectDescriptionBasicTests_"; IProject p1, p2, p3, p4; diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionDeltaTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionDeltaTests.java index 69cdfe6a038..fec70dc650c 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionDeltaTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionDeltaTests.java @@ -19,8 +19,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvider; import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvidersKeeper; @@ -32,6 +30,8 @@ import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; +import junit.framework.TestSuite; + public class CProjectDescriptionDeltaTests extends BaseTestCase { private MockListener listener; diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionStorageTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionStorageTests.java index 41c8ae5fe9a..07dfa8fc3a5 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionStorageTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionStorageTests.java @@ -21,8 +21,6 @@ import java.io.FileOutputStream; import java.util.HashSet; import java.util.Set; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CoreModel; @@ -46,6 +44,8 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.preferences.InstanceScope; +import junit.framework.TestSuite; + /** * Testsuite for the project description storage. This * currently tests some of the features of the built-in diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CfgSettingsTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CfgSettingsTests.java index 8e38d4d59e5..fbb4e74fac7 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CfgSettingsTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CfgSettingsTests.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.settings.model; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICProject; @@ -23,6 +21,8 @@ import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; +import junit.framework.TestSuite; + public class CfgSettingsTests extends BaseTestCase { private static final String PROJ_NAME_PREFIX = "sfgst_"; ICProject p1; diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ExternalSettingsProviderTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ExternalSettingsProviderTests.java index eda6f82fe08..b32f161bae1 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ExternalSettingsProviderTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ExternalSettingsProviderTests.java @@ -21,8 +21,6 @@ package org.eclipse.cdt.core.settings.model; import java.util.Arrays; import java.util.HashMap; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICProject; @@ -34,6 +32,8 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Path; +import junit.framework.TestSuite; + public class ExternalSettingsProviderTests extends BaseTestCase { private static final String PROJ_NAME_PREFIX = "espt_"; ICProject p1, p2, p3, p4, p5, p6; diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/PathSettingsContainerTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/PathSettingsContainerTests.java index bb4360e942a..c20952bdfb8 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/PathSettingsContainerTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/PathSettingsContainerTests.java @@ -14,13 +14,13 @@ package org.eclipse.cdt.core.settings.model; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.settings.model.util.PathSettingsContainer; import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; +import junit.framework.TestSuite; + /** */ public class PathSettingsContainerTests extends BaseTestCase { diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ProjectCreationStateTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ProjectCreationStateTests.java index cad4255c901..b3e82525e76 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ProjectCreationStateTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ProjectCreationStateTests.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.settings.model; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.CProjectNature; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CoreModel; @@ -28,6 +26,8 @@ import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; +import junit.framework.TestSuite; + public class ProjectCreationStateTests extends BaseTestCase { private static final String PROJ_NAME_PREFIX = "ProjectCreationStateTests_"; diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ASTComparer.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ASTComparer.java index 2357ebd77a3..5387fbd40b9 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ASTComparer.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ASTComparer.java @@ -22,12 +22,12 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import junit.framework.AssertionFailedError; - import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.internal.core.dom.parser.ASTNode; import org.junit.Assert; +import junit.framework.AssertionFailedError; + public class ASTComparer extends Assert { private static Set<String> methodsToIgnore = new HashSet<>(Arrays.asList( diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ContentAssistMatcherFactoryTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ContentAssistMatcherFactoryTest.java index 3d7a439e7e2..1ea575e45a8 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ContentAssistMatcherFactoryTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ContentAssistMatcherFactoryTest.java @@ -15,11 +15,11 @@ package org.eclipse.cdt.core.parser.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.parser.util.IContentAssistMatcher; import org.eclipse.cdt.internal.core.parser.util.ContentAssistMatcherFactory; +import junit.framework.TestCase; + public class ContentAssistMatcherFactoryTest extends TestCase { @Override diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/FileBasePluginTestCase.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/FileBasePluginTestCase.java index 183e4cb41d6..c906818fd72 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/FileBasePluginTestCase.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/FileBasePluginTestCase.java @@ -16,8 +16,6 @@ package org.eclipse.cdt.core.parser.tests; import java.io.ByteArrayInputStream; import java.io.InputStream; -import junit.framework.TestCase; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.ICProject; @@ -32,6 +30,8 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; +import junit.framework.TestCase; + /** * @author dsteffle */ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/SegmentMatcherTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/SegmentMatcherTest.java index 066e2e0af1d..e20613b8ab0 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/SegmentMatcherTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/SegmentMatcherTest.java @@ -15,10 +15,10 @@ package org.eclipse.cdt.core.parser.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.parser.util.SegmentMatcher; +import junit.framework.TestCase; + public class SegmentMatcherTest extends TestCase { public void testSimple() { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/VisibilityAsserts.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/VisibilityAsserts.java index f50746f4f98..14e67f82df3 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/VisibilityAsserts.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/VisibilityAsserts.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.core.parser.tests; import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType; + import junit.framework.Assert; public class VisibilityAsserts { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPSpecTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPSpecTest.java index dcc6441edac..b84af24aa38 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPSpecTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPSpecTest.java @@ -16,8 +16,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.tests.ast2; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.ASTTypeUtil; import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; import org.eclipse.cdt.core.dom.ast.IASTDeclaration; @@ -47,6 +45,8 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPUnknownBinding; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; +import junit.framework.TestSuite; + /** * Examples taken from the c++-specification. */ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2FileBasePluginTestCase.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2FileBasePluginTestCase.java index db53d108ae7..66b7a246221 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2FileBasePluginTestCase.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2FileBasePluginTestCase.java @@ -17,8 +17,6 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import junit.framework.TestCase; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.ICProject; @@ -35,6 +33,8 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; +import junit.framework.TestCase; + /** * @author dsteffle */ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/ASTCPPSpecDefectTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/ASTCPPSpecDefectTests.java index 27e33057060..fbaae3ff4d5 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/ASTCPPSpecDefectTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/ASTCPPSpecDefectTests.java @@ -13,11 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.tests.ast2; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.parser.ParserLanguage; +import junit.framework.TestSuite; + public class ASTCPPSpecDefectTests extends AST2TestBase { public ASTCPPSpecDefectTests() { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/ASTInactiveCodeTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/ASTInactiveCodeTests.java index 659d659b01f..99134caf376 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/ASTInactiveCodeTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/ASTInactiveCodeTests.java @@ -15,8 +15,6 @@ package org.eclipse.cdt.core.parser.tests.ast2; import java.util.BitSet; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTDeclaration; import org.eclipse.cdt.core.dom.ast.IASTDeclarationListOwner; import org.eclipse.cdt.core.dom.ast.IASTFunctionDeclarator; @@ -28,6 +26,8 @@ import org.eclipse.cdt.core.dom.ast.IVariable; import org.eclipse.cdt.core.parser.IScanner; import org.eclipse.cdt.core.parser.ParserLanguage; +import junit.framework.TestSuite; + /** * Testcases for inactive code in ast. */ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/ASTNodeSelectorTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/ASTNodeSelectorTest.java index fba3e4f2c50..7a1d3870cbc 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/ASTNodeSelectorTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/ASTNodeSelectorTest.java @@ -15,8 +15,6 @@ package org.eclipse.cdt.core.parser.tests.ast2; import java.io.IOException; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTNodeSelector; @@ -31,6 +29,8 @@ import org.eclipse.cdt.core.parser.ParserMode; import org.eclipse.cdt.core.parser.ScannerInfo; import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser; +import junit.framework.TestSuite; + public class ASTNodeSelectorTest extends AST2TestBase { static public TestSuite suite() { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AccessControlTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AccessControlTests.java index 3d99d0cfc6c..5589a0716a4 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AccessControlTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AccessControlTests.java @@ -15,7 +15,6 @@ package org.eclipse.cdt.core.parser.tests.ast2; import static org.eclipse.cdt.core.parser.tests.VisibilityAsserts.assertVisibility; -import junit.framework.TestSuite; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IBinding; @@ -24,6 +23,8 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.AccessContext; import org.eclipse.cdt.internal.core.parser.ParserException; +import junit.framework.TestSuite; + public class AccessControlTests extends AST2TestBase { protected class AccessAssertionHelper extends AST2AssertionHelper { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CharArrayMapTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CharArrayMapTest.java index 3617853de35..f3412ab002e 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CharArrayMapTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CharArrayMapTest.java @@ -19,11 +19,11 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import junit.framework.TestCase; - import org.eclipse.cdt.core.parser.util.CharArrayMap; import org.eclipse.cdt.core.parser.util.CharArrayObjectMap; +import junit.framework.TestCase; + /** * * @author Mike Kucera diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CommentTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CommentTests.java index 3e3e57d52f8..4279a24a257 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CommentTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CommentTests.java @@ -14,14 +14,14 @@ ******************************************************************************/ package org.eclipse.cdt.core.parser.tests.ast2; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTComment; import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.internal.core.parser.ParserException; +import junit.framework.TestSuite; + /** * @author Guido Zgraggen * diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMFileBasePluginTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMFileBasePluginTest.java index 15ca397d23e..c068e99b690 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMFileBasePluginTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMFileBasePluginTest.java @@ -20,8 +20,6 @@ package org.eclipse.cdt.core.parser.tests.ast2; import java.io.ByteArrayInputStream; import java.io.InputStream; -import junit.framework.TestCase; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.ICProject; @@ -36,6 +34,8 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; +import junit.framework.TestCase; + /** * @author dsteffle */ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMLocationTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMLocationTests.java index 997fd70aaef..6a7b86be2f7 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMLocationTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMLocationTests.java @@ -14,8 +14,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.tests.ast2; -import junit.framework.TestSuite; - import java.util.Arrays; import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; @@ -77,6 +75,8 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.internal.core.dom.parser.ASTNode; import org.eclipse.cdt.internal.core.parser.ParserException; +import junit.framework.TestSuite; + /** * @author jcamelon */ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMSearchUtil.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMSearchUtil.java index 142355b1775..61b52bea990 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMSearchUtil.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMSearchUtil.java @@ -17,8 +17,6 @@ package org.eclipse.cdt.core.parser.tests.ast2; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IName; import org.eclipse.cdt.core.dom.ast.ASTVisitor; @@ -37,6 +35,8 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.content.IContentType; +import junit.framework.Assert; + /** * Utility class to have commonly used algorithms in one place for searching with the DOM. * diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/FaultToleranceTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/FaultToleranceTests.java index fb3039a0d25..45dbabb9260 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/FaultToleranceTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/FaultToleranceTests.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.tests.ast2; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; import org.eclipse.cdt.core.dom.ast.IASTDeclarationStatement; import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition; @@ -30,6 +28,8 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLinkageSpecification; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNamespaceDefinition; import org.eclipse.cdt.core.parser.ParserLanguage; +import junit.framework.TestSuite; + /** * Testcases related to recovery from invalid syntax. */ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/ImageLocationTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/ImageLocationTests.java index 01863280ad2..8f632dec816 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/ImageLocationTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/ImageLocationTests.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.tests.ast2; -import junit.framework.Test; - import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTDeclaration; import org.eclipse.cdt.core.dom.ast.IASTImageLocation; @@ -23,6 +21,8 @@ import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.parser.ParserLanguage; +import junit.framework.Test; + /** * @author jcamelon */ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/LanguageExtensionsTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/LanguageExtensionsTest.java index 174a818dab1..57af78f07c1 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/LanguageExtensionsTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/LanguageExtensionsTest.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.tests.ast2; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTDeclaration; import org.eclipse.cdt.core.dom.ast.IASTExpressionList; import org.eclipse.cdt.core.dom.ast.IASTFunctionDeclarator; @@ -34,8 +32,8 @@ import org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.cpp.POPCPPParserExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.cpp.POPCPPScannerExtensionConfiguration; import org.eclipse.cdt.core.parser.FileContent; -import org.eclipse.cdt.core.parser.IncludeFileContentProvider; import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.core.parser.IncludeFileContentProvider; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.ParserMode; import org.eclipse.cdt.core.parser.ScannerInfo; @@ -44,6 +42,8 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; import org.eclipse.cdt.internal.core.parser.scanner.CPreprocessor; +import junit.framework.TestSuite; + /** * Testcases for non-gnu language extensions. */ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/QuickParser2Tests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/QuickParser2Tests.java index 15e5fc21154..c1138d60a3c 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/QuickParser2Tests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/QuickParser2Tests.java @@ -18,8 +18,6 @@ import java.io.IOException; import java.io.StringWriter; import java.io.Writer; -import junit.framework.TestCase; - import org.eclipse.cdt.core.dom.ast.IASTProblem; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.parser.ISourceCodeParser; @@ -43,6 +41,8 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; import org.eclipse.cdt.internal.core.parser.ParserException; +import junit.framework.TestCase; + /** * @author jcamelon */ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/TaskParserTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/TaskParserTest.java index f72697dba37..891fdaafa90 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/TaskParserTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/TaskParserTest.java @@ -14,13 +14,13 @@ package org.eclipse.cdt.core.parser.tests.ast2; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.internal.core.pdom.indexer.TodoTaskParser; import org.eclipse.cdt.internal.core.pdom.indexer.TodoTaskParser.Task; +import junit.framework.TestSuite; + public class TaskParserTest extends AST2TestBase { public static TestSuite suite() { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/VariableReadWriteFlagsTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/VariableReadWriteFlagsTest.java index 852cbdcb42c..2f024e8cd33 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/VariableReadWriteFlagsTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/VariableReadWriteFlagsTest.java @@ -15,14 +15,14 @@ package org.eclipse.cdt.core.parser.tests.ast2; import java.io.IOException; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.internal.core.dom.parser.c.CVariableReadWriteFlags; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVariableReadWriteFlags; import org.eclipse.cdt.internal.core.parser.ParserException; import org.eclipse.cdt.internal.core.pdom.dom.PDOMName; +import junit.framework.TestSuite; + /** * Unit tests for CPPVariableReadWriteFlags and CVariableReadWriteFlags classes. */ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/ReturnTypeDeductionTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/ReturnTypeDeductionTests.java index 904d90a17ae..bcb161f0354 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/ReturnTypeDeductionTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/cxx14/ReturnTypeDeductionTests.java @@ -13,12 +13,12 @@ package org.eclipse.cdt.core.parser.tests.ast2.cxx14; import org.eclipse.cdt.core.dom.ast.IProblemType; import org.eclipse.cdt.core.dom.ast.IType; import org.eclipse.cdt.core.dom.ast.ITypedef; -import org.eclipse.cdt.core.parser.tests.ast2.AST2CPPTestBase; -import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPClosureType; import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunction; import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunctionTemplate; import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateInstance; import org.eclipse.cdt.core.dom.ast.cpp.ICPPVariable; +import org.eclipse.cdt.core.parser.tests.ast2.AST2CPPTestBase; +import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPClosureType; public class ReturnTypeDeductionTests extends AST2CPPTestBase { private IType getReturnType(String functionName) throws Exception { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/prefix/CompletionTestBase.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/prefix/CompletionTestBase.java index ce2a4fc6f13..3ecb8f8d815 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/prefix/CompletionTestBase.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/prefix/CompletionTestBase.java @@ -21,8 +21,6 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; -import junit.framework.AssertionFailedError; - import org.eclipse.cdt.core.dom.ast.IASTCompletionContext; import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; import org.eclipse.cdt.core.dom.ast.IASTName; @@ -49,6 +47,8 @@ import org.eclipse.cdt.internal.core.dom.parser.c.GNUCSourceParser; import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser; import org.eclipse.cdt.internal.core.parser.ParserException; +import junit.framework.AssertionFailedError; + public class CompletionTestBase extends BaseTestCase { private static final IParserLogService NULL_LOG = new NullLogService(); diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/RewriteTester.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/RewriteTester.java index 201d1c450ee..d3ac75ce15c 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/RewriteTester.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/RewriteTester.java @@ -25,15 +25,15 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.testplugin.CTestPlugin; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; import org.eclipse.jface.text.TextSelection; import org.osgi.framework.Bundle; +import junit.framework.Test; +import junit.framework.TestSuite; + /** * @author Emanuel Graf */ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/RewriteTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/RewriteTests.java index 3f96baeeda4..61fbef38589 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/RewriteTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/RewriteTests.java @@ -14,13 +14,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.tests.rewrite; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.parser.tests.rewrite.astwriter.AstWriterTestSuite; import org.eclipse.cdt.core.parser.tests.rewrite.changegenerator.ChangeGeneratorTestSuite; import org.eclipse.cdt.core.parser.tests.rewrite.comenthandler.CommentHandlingTestSuite; +import junit.framework.Test; +import junit.framework.TestSuite; + public class RewriteTests extends TestSuite { public static Test suite() throws Exception { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/astwriter/ExpressionWriterTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/astwriter/ExpressionWriterTest.java index 1d487f4cc17..bbec548d9c6 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/astwriter/ExpressionWriterTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/astwriter/ExpressionWriterTest.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.tests.rewrite.astwriter; -import junit.framework.TestCase; - import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTDeclarator; import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression; @@ -40,6 +38,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import junit.framework.TestCase; + public class ExpressionWriterTest extends TestCase { private static final String BR = System.getProperty("line.separator"); private static CPPASTSimpleDeclSpecifier INT = new CPPASTSimpleDeclSpecifier(); diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/astwriter/SourceRewriteTester.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/astwriter/SourceRewriteTester.java index 0ce052d7447..e537e6c0ef6 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/astwriter/SourceRewriteTester.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/astwriter/SourceRewriteTester.java @@ -21,9 +21,6 @@ import java.util.ArrayList; import java.util.regex.Matcher; import java.util.regex.Pattern; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.rewrite.RewriteBaseTest; import org.eclipse.cdt.core.testplugin.CTestPlugin; @@ -32,6 +29,9 @@ import org.eclipse.core.runtime.Path; import org.eclipse.jface.text.TextSelection; import org.osgi.framework.Bundle; +import junit.framework.Test; +import junit.framework.TestSuite; + public class SourceRewriteTester extends TestSuite { private static final String testRegexp = "//!(.*)\\s*(\\w*)*$"; //$NON-NLS-1$ private static final String codeTypeRegexp = "//%(C|CPP)( GNU)?$"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/changegenerator/AppendTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/changegenerator/AppendTests.java index 8b969b3c876..302de275be7 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/changegenerator/AppendTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/changegenerator/AppendTests.java @@ -15,10 +15,8 @@ package org.eclipse.cdt.core.parser.tests.rewrite.changegenerator; -import static org.eclipse.cdt.internal.core.dom.rewrite.ASTModification.ModificationKind.APPEND_CHILD; import static org.eclipse.cdt.core.dom.ast.IASTLiteralExpression.lk_integer_constant; - -import junit.framework.TestSuite; +import static org.eclipse.cdt.internal.core.dom.rewrite.ASTModification.ModificationKind.APPEND_CHILD; import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTArrayDeclarator; @@ -56,6 +54,8 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTParameterDeclaration; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTSimpleDeclSpecifier; import org.eclipse.cdt.internal.core.dom.rewrite.ASTModificationStore; +import junit.framework.TestSuite; + public class AppendTests extends ChangeGeneratorTest { public static TestSuite suite() { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/changegenerator/ChangeGeneratorTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/changegenerator/ChangeGeneratorTest.java index 97ea5c07d61..e8e5dc7089a 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/changegenerator/ChangeGeneratorTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/changegenerator/ChangeGeneratorTest.java @@ -15,7 +15,8 @@ package org.eclipse.cdt.core.parser.tests.rewrite.changegenerator; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.is; import java.io.IOException; diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/changegenerator/InsertBeforeTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/changegenerator/InsertBeforeTests.java index 3e9e0d9163f..2b07073149e 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/changegenerator/InsertBeforeTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/changegenerator/InsertBeforeTests.java @@ -17,7 +17,6 @@ package org.eclipse.cdt.core.parser.tests.rewrite.changegenerator; import static org.eclipse.cdt.core.dom.ast.IASTLiteralExpression.lk_integer_constant; import static org.eclipse.cdt.internal.core.dom.rewrite.ASTModification.ModificationKind.INSERT_BEFORE; -import junit.framework.TestSuite; import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTArrayDeclarator; @@ -52,6 +51,8 @@ import org.eclipse.cdt.internal.core.dom.rewrite.ASTModification; import org.eclipse.cdt.internal.core.dom.rewrite.ASTModification.ModificationKind; import org.eclipse.cdt.internal.core.dom.rewrite.astwriter.ContainerNode; +import junit.framework.TestSuite; + public class InsertBeforeTests extends ChangeGeneratorTest { public static TestSuite suite() { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/changegenerator/RemoveTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/changegenerator/RemoveTests.java index 5b1f416c979..0d638ca2531 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/changegenerator/RemoveTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/changegenerator/RemoveTests.java @@ -16,7 +16,6 @@ package org.eclipse.cdt.core.parser.tests.rewrite.changegenerator; import static org.eclipse.cdt.internal.core.dom.rewrite.ASTModification.ModificationKind.REPLACE; -import junit.framework.TestSuite; import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTArrayDeclarator; @@ -40,6 +39,8 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFunctionDeclarator; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFunctionDefinition; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNewExpression; +import junit.framework.TestSuite; + public class RemoveTests extends ChangeGeneratorTest { public static TestSuite suite() { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/CommentHandlingTestSuite.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/CommentHandlingTestSuite.java index 93c068a3eff..75cd37ff73f 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/CommentHandlingTestSuite.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/CommentHandlingTestSuite.java @@ -14,11 +14,11 @@ ******************************************************************************/ package org.eclipse.cdt.core.parser.tests.rewrite.comenthandler; +import org.eclipse.cdt.core.parser.tests.rewrite.RewriteTester; + import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.cdt.core.parser.tests.rewrite.RewriteTester; - /** * @author Guido Zgraggen IFS */ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/NodeCommentMapTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/NodeCommentMapTest.java index 9548aa451e0..f47f13f485a 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/NodeCommentMapTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/NodeCommentMapTest.java @@ -14,8 +14,6 @@ ******************************************************************************/ package org.eclipse.cdt.core.parser.tests.rewrite.comenthandler; -import junit.framework.TestCase; - import java.util.List; import org.eclipse.cdt.core.dom.ast.IASTComment; @@ -24,6 +22,8 @@ import org.eclipse.cdt.internal.core.dom.parser.ASTNode; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTName; import org.eclipse.cdt.internal.core.dom.rewrite.commenthandler.NodeCommentMap; +import junit.framework.TestCase; + /** * @author Guido Zgraggen IFS */ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/FileCharArrayTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/FileCharArrayTests.java index 3d9f01bbe5a..1125b4d3b33 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/FileCharArrayTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/FileCharArrayTests.java @@ -20,13 +20,13 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.cdt.internal.core.parser.scanner.AbstractCharArray; import org.eclipse.cdt.internal.core.parser.scanner.FileCharArray; import org.eclipse.cdt.internal.core.parser.scanner.LazyCharArray; +import junit.framework.TestSuite; + public class FileCharArrayTests extends BaseTestCase { public static TestSuite suite() { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/InclusionTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/InclusionTests.java index 34334c1cada..1f81668a075 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/InclusionTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/InclusionTests.java @@ -17,8 +17,6 @@ package org.eclipse.cdt.core.parser.tests.scanner; import java.util.Collections; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.parser.ExtendedScannerInfo; import org.eclipse.cdt.core.parser.FileContent; @@ -34,6 +32,8 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.runtime.NullProgressMonitor; +import junit.framework.TestSuite; + /** * Scanner2Tests ported to use the CPreprocessor */ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/LexerTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/LexerTests.java index def54b471f9..6fef3fe2675 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/LexerTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/LexerTests.java @@ -14,8 +14,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.tests.scanner; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.parser.IGCCToken; import org.eclipse.cdt.core.parser.IProblem; import org.eclipse.cdt.core.parser.IToken; @@ -25,6 +23,8 @@ import org.eclipse.cdt.internal.core.parser.scanner.Lexer; import org.eclipse.cdt.internal.core.parser.scanner.Lexer.LexerOptions; import org.eclipse.cdt.internal.core.parser.scanner.Token; +import junit.framework.TestSuite; + public class LexerTests extends BaseTestCase { private static final LexerOptions DEFAULT_OPTIONS = new LexerOptions(); private static final LexerOptions NO_DOLLAR = new LexerOptions(); diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/LocationMapTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/LocationMapTests.java index d3394d519bf..f11f92e7eef 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/LocationMapTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/LocationMapTests.java @@ -15,8 +15,6 @@ package org.eclipse.cdt.core.parser.tests.scanner; import java.io.IOException; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.IName; import org.eclipse.cdt.core.dom.ast.ASTNodeProperty; import org.eclipse.cdt.core.dom.ast.IASTComment; @@ -56,6 +54,8 @@ import org.eclipse.cdt.internal.core.parser.scanner.ImageLocationInfo; import org.eclipse.cdt.internal.core.parser.scanner.Lexer.LexerOptions; import org.eclipse.cdt.internal.core.parser.scanner.LocationMap; +import junit.framework.TestSuite; + public class LocationMapTests extends BaseTestCase { public class Loc implements IASTFileLocation, IName { private String fFile; diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/PreprocessorBugsTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/PreprocessorBugsTests.java index d4e941348ba..91bd85eb7e1 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/PreprocessorBugsTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/PreprocessorBugsTests.java @@ -14,12 +14,12 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.tests.scanner; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.parser.IProblem; import org.eclipse.cdt.core.parser.IToken; import org.eclipse.cdt.internal.core.parser.scanner.CPreprocessor; +import junit.framework.TestSuite; + /** * Scanner2Tests ported to use the CPreprocessor plus additional bugs fixed in * the CPreprocessor, afterwards. diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/StreamHasherTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/StreamHasherTests.java index f31602849c8..7c493ec65d3 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/StreamHasherTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/StreamHasherTests.java @@ -13,11 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.tests.scanner; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.cdt.internal.core.parser.scanner.StreamHasher; +import junit.framework.TestSuite; + /** * Unit test for StreamHasher class. */ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCBindingResolutionBugs.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCBindingResolutionBugs.java index 25ecfe783ea..d65e0fc4295 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCBindingResolutionBugs.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCBindingResolutionBugs.java @@ -15,8 +15,6 @@ *******************************************************************************/ package org.eclipse.cdt.internal.index.tests; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.DOMException; import org.eclipse.cdt.core.dom.ast.IBasicType; import org.eclipse.cdt.core.dom.ast.IBinding; @@ -33,6 +31,8 @@ import org.eclipse.cdt.core.dom.ast.IVariable; import org.eclipse.cdt.core.dom.ast.c.ICCompositeTypeScope; import org.eclipse.cdt.core.index.IIndexBinding; +import junit.framework.TestSuite; + /** * For testing PDOM binding resolution */ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CCompositeTypeTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CCompositeTypeTests.java index f8c920ead7c..20877d38d78 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CCompositeTypeTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CCompositeTypeTests.java @@ -16,9 +16,6 @@ package org.eclipse.cdt.internal.pdom.tests; import java.util.regex.Pattern; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.ICompositeType; import org.eclipse.cdt.core.index.IIndexBinding; import org.eclipse.cdt.core.index.IndexFilter; @@ -28,6 +25,9 @@ import org.eclipse.cdt.internal.core.pdom.PDOM; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.NullProgressMonitor; +import junit.framework.Test; +import junit.framework.TestSuite; + /** * Tests for verifying whether the PDOM correctly stores information about * C structs and unions. diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CFunctionTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CFunctionTests.java index 44bdc960ff5..5e829fc4680 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CFunctionTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CFunctionTests.java @@ -14,8 +14,6 @@ *******************************************************************************/ package org.eclipse.cdt.internal.pdom.tests; -import junit.framework.Test; - import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IFunction; import org.eclipse.cdt.core.dom.ast.IParameter; @@ -26,6 +24,8 @@ import org.eclipse.cdt.internal.core.pdom.PDOM; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.NullProgressMonitor; +import junit.framework.Test; + /** * Tests for verifying whether the PDOM correctly stores information about * C functions. diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CPPCompositeTypeTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CPPCompositeTypeTests.java index aa87d96edde..aa0400d35dc 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CPPCompositeTypeTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CPPCompositeTypeTests.java @@ -14,14 +14,14 @@ package org.eclipse.cdt.internal.pdom.tests; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.ICompositeType; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.internal.core.CCoreInternals; import org.eclipse.cdt.internal.core.pdom.PDOM; +import junit.framework.Test; +import junit.framework.TestSuite; + /** * Tests for verifying whether the PDOM correctly stores information about * C++ structs and unions. diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CPPFieldTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CPPFieldTests.java index 15202001fe2..d57e25f881c 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CPPFieldTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CPPFieldTests.java @@ -14,8 +14,6 @@ package org.eclipse.cdt.internal.pdom.tests; -import junit.framework.Test; - import org.eclipse.cdt.core.dom.ast.DOMException; import org.eclipse.cdt.core.dom.ast.IBasicType; import org.eclipse.cdt.core.dom.ast.IBinding; @@ -29,6 +27,8 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; +import junit.framework.Test; + /** * Tests for verifying whether the PDOM correctly stores information about * C++ class data members. diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CPPFunctionTemplateTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CPPFunctionTemplateTests.java index 835a10b4ef4..ae82028abed 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CPPFunctionTemplateTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CPPFunctionTemplateTests.java @@ -17,8 +17,6 @@ package org.eclipse.cdt.internal.pdom.tests; import java.util.Arrays; import java.util.List; -import junit.framework.Test; - import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunctionTemplate; import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateInstance; @@ -26,6 +24,8 @@ import org.eclipse.cdt.core.index.IndexFilter; import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInstanceCache; import org.eclipse.cdt.internal.core.index.IIndexFragment; +import junit.framework.Test; + public class CPPFunctionTemplateTests extends PDOMInlineCodeTestBase { public static Test suite() { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CVariableTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CVariableTests.java index caf5d01d5a0..539c1fd4a46 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CVariableTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CVariableTests.java @@ -15,8 +15,6 @@ package org.eclipse.cdt.internal.pdom.tests; -import junit.framework.Test; - import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IVariable; import org.eclipse.cdt.core.model.ICProject; @@ -25,6 +23,8 @@ import org.eclipse.cdt.internal.core.pdom.PDOM; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.NullProgressMonitor; +import junit.framework.Test; + /** * Tests for verifying whether the PDOM correctly stores information about * C variable declarations. diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/ChangeConfigurationTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/ChangeConfigurationTests.java index 1188a3e5707..86d90490a8d 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/ChangeConfigurationTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/ChangeConfigurationTests.java @@ -15,8 +15,6 @@ package org.eclipse.cdt.internal.pdom.tests; import java.util.regex.Pattern; -import junit.framework.Test; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.dom.ast.IBinding; @@ -40,6 +38,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; +import junit.framework.Test; + public class ChangeConfigurationTests extends PDOMTestBase { public static Test suite() { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/ClassMemberVisibilityTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/ClassMemberVisibilityTests.java index 3787f5562a1..33f9f48629e 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/ClassMemberVisibilityTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/ClassMemberVisibilityTests.java @@ -14,13 +14,13 @@ *******************************************************************************/ package org.eclipse.cdt.internal.pdom.tests; -import junit.framework.Test; +import static org.eclipse.cdt.core.parser.tests.VisibilityAsserts.assertVisibility; import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType; import org.eclipse.core.runtime.CoreException; -import static org.eclipse.cdt.core.parser.tests.VisibilityAsserts.assertVisibility; +import junit.framework.Test; /** * @author Thomas Corbat diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/DBPropertiesTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/DBPropertiesTests.java index eb638a8d35b..32ccd243b3f 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/DBPropertiesTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/DBPropertiesTests.java @@ -18,14 +18,14 @@ import java.io.File; import java.util.Iterator; import java.util.Properties; -import junit.framework.Test; - import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.cdt.internal.core.pdom.db.ChunkCache; import org.eclipse.cdt.internal.core.pdom.db.DBProperties; import org.eclipse.cdt.internal.core.pdom.db.Database; import org.eclipse.core.runtime.CoreException; +import junit.framework.Test; + /** * Tests for the {@link DBProperties} class. */ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/DatabaseTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/DatabaseTest.java index 9b193fc2885..d297945ef76 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/DatabaseTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/DatabaseTest.java @@ -18,8 +18,6 @@ package org.eclipse.cdt.internal.pdom.tests; import java.io.File; import java.util.Random; -import junit.framework.Test; - import org.eclipse.cdt.core.testplugin.CTestPlugin; import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.cdt.internal.core.pdom.db.BTree; @@ -32,6 +30,8 @@ import org.eclipse.cdt.internal.core.pdom.db.ShortString; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; +import junit.framework.Test; + /** * Tests for the {@link Database} class. */ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/EnumerationTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/EnumerationTests.java index 2193846237b..c5a195530de 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/EnumerationTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/EnumerationTests.java @@ -18,8 +18,6 @@ import java.util.Arrays; import java.util.Comparator; import java.util.regex.Pattern; -import junit.framework.Test; - import org.eclipse.cdt.core.dom.IName; import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IBinding; @@ -32,6 +30,8 @@ import org.eclipse.cdt.internal.core.CCoreInternals; import org.eclipse.cdt.internal.core.pdom.PDOM; import org.eclipse.core.runtime.NullProgressMonitor; +import junit.framework.Test; + /** * @author Doug Schaefer */ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/FilesOnReindexTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/FilesOnReindexTests.java index cc4d66dc5b7..7564f347290 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/FilesOnReindexTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/FilesOnReindexTests.java @@ -15,8 +15,6 @@ package org.eclipse.cdt.internal.pdom.tests; import java.util.regex.Pattern; -import junit.framework.Test; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.ILinkage; import org.eclipse.cdt.core.dom.ast.IBinding; @@ -32,6 +30,8 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; +import junit.framework.Test; + /** * See bugzilla */ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/GeneratePDOMApplicationTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/GeneratePDOMApplicationTest.java index 4f91310831c..674e344e6d5 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/GeneratePDOMApplicationTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/GeneratePDOMApplicationTest.java @@ -23,8 +23,6 @@ import java.util.HashMap; import java.util.Map; import java.util.regex.Pattern; -import junit.framework.Test; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.ILinkage; import org.eclipse.cdt.core.dom.IPDOMManager; @@ -53,6 +51,8 @@ import org.eclipse.equinox.app.IApplication; import org.eclipse.equinox.app.IApplicationContext; import org.osgi.framework.Bundle; +import junit.framework.Test; + /** * Tests the GeneratePDOMApplication */ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/IncludesTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/IncludesTests.java index 72d47e2fac7..28f74fc7e34 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/IncludesTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/IncludesTests.java @@ -14,8 +14,6 @@ *******************************************************************************/ package org.eclipse.cdt.internal.pdom.tests; -import junit.framework.Test; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.ILinkage; import org.eclipse.cdt.core.index.IIndex; @@ -28,6 +26,8 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Path; +import junit.framework.Test; + /** * @author Doug Schaefer */ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/MethodTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/MethodTests.java index bc53b25eb25..682a823b228 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/MethodTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/MethodTests.java @@ -14,8 +14,6 @@ *******************************************************************************/ package org.eclipse.cdt.internal.pdom.tests; -import junit.framework.Test; - import org.eclipse.cdt.core.dom.ast.IBasicType; import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IParameter; @@ -30,6 +28,8 @@ import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.internal.core.CCoreInternals; import org.eclipse.cdt.internal.core.pdom.PDOM; +import junit.framework.Test; + /** * Tests for verifying whether the PDOM correctly stores information about * C++ class member functions. diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/NamespaceTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/NamespaceTests.java index 1e247302e73..5618368f9bd 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/NamespaceTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/NamespaceTests.java @@ -15,8 +15,6 @@ package org.eclipse.cdt.internal.pdom.tests; import java.util.regex.Pattern; -import junit.framework.Test; - import org.eclipse.cdt.core.dom.IName; import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IBinding; @@ -33,6 +31,8 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; +import junit.framework.Test; + /** * Tests for verifying whether the PDOM correctly stores information about C++ namespaces. * diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/OverloadsWithinCommonHeaderTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/OverloadsWithinCommonHeaderTests.java index d3dd0b713b5..c48b7cdfb20 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/OverloadsWithinCommonHeaderTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/OverloadsWithinCommonHeaderTests.java @@ -15,8 +15,6 @@ package org.eclipse.cdt.internal.pdom.tests; import java.util.regex.Pattern; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ILinkage; import org.eclipse.cdt.core.dom.ast.IBasicType; import org.eclipse.cdt.core.dom.ast.IBinding; @@ -29,6 +27,8 @@ import org.eclipse.cdt.internal.core.pdom.PDOM; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; +import junit.framework.TestSuite; + /** * Test overloaded symbols are correctly resolved when in a common header. This * is of interested with the Fast Indexer, as binding resolution occurs purely on diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/OverloadsWithinSingleTUTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/OverloadsWithinSingleTUTests.java index 1e1f842957a..8008047d34d 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/OverloadsWithinSingleTUTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/OverloadsWithinSingleTUTests.java @@ -15,8 +15,6 @@ package org.eclipse.cdt.internal.pdom.tests; import java.util.regex.Pattern; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IBasicType; import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType; @@ -27,6 +25,8 @@ import org.eclipse.cdt.internal.core.pdom.PDOM; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; +import junit.framework.TestSuite; + /** * Test overloaded symbols are correctly resolved when within a single translation * unit. This covers the case of adapting non-PDOM bindings to PDOM bindings by diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMCBugsTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMCBugsTest.java index 07b5c0baed3..c2d5848184b 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMCBugsTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMCBugsTest.java @@ -19,8 +19,6 @@ import java.util.HashSet; import java.util.Set; import java.util.regex.Pattern; -import junit.framework.Test; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.dom.ast.ASTTypeUtil; @@ -44,6 +42,8 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.osgi.framework.Bundle; +import junit.framework.Test; + public class PDOMCBugsTest extends BaseTestCase { ICProject cproject; PDOM pdom; diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMCPPBugsTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMCPPBugsTest.java index 630c423260b..45f3209de8d 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMCPPBugsTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMCPPBugsTest.java @@ -18,8 +18,6 @@ package org.eclipse.cdt.internal.pdom.tests; import java.io.File; import java.util.regex.Pattern; -import junit.framework.Test; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IName; import org.eclipse.cdt.core.dom.IPDOMManager; @@ -49,6 +47,8 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; +import junit.framework.Test; + /** * Tests bugs found in the PDOM. */ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMLocationTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMLocationTests.java index cc70fc1037f..a66acbb4760 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMLocationTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMLocationTests.java @@ -17,8 +17,6 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import junit.framework.Test; - import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.index.IIndexFileLocation; import org.eclipse.cdt.core.index.IndexLocationFactory; @@ -30,6 +28,8 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Platform; +import junit.framework.Test; + /** * Tests behavior related to location representation in the PDOM */ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMNameTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMNameTests.java index 01982852ea2..abb00ae383c 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMNameTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMNameTests.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.internal.pdom.tests; -import junit.framework.Test; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.index.IIndexBinding; @@ -33,6 +31,8 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.NullProgressMonitor; +import junit.framework.Test; + public class PDOMNameTests extends BaseTestCase { private ICProject cproject; diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMProviderTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMProviderTests.java index d61620e97a5..38f256ac29b 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMProviderTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMProviderTests.java @@ -19,8 +19,6 @@ import static org.eclipse.cdt.core.testplugin.CProjectHelper.createCCProject; import java.io.File; import java.net.URI; -import junit.framework.Test; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.dom.ast.IBinding; @@ -47,6 +45,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; +import junit.framework.Test; + /** * Tests addition of external pdom's into the logical index */ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMSearchTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMSearchTest.java index 46480e34469..cb3069e238b 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMSearchTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMSearchTest.java @@ -18,8 +18,6 @@ import java.util.Arrays; import java.util.Comparator; import java.util.regex.Pattern; -import junit.framework.Test; - import org.eclipse.cdt.core.dom.IName; import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IBinding; @@ -42,6 +40,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; +import junit.framework.Test; + /** * Test the correctness of C/C++ searches. * diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMStringSetTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMStringSetTests.java index c0d761327db..e06d410e430 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMStringSetTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMStringSetTests.java @@ -15,13 +15,13 @@ package org.eclipse.cdt.internal.pdom.tests; import java.io.File; -import junit.framework.Test; - import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.cdt.internal.core.pdom.db.ChunkCache; import org.eclipse.cdt.internal.core.pdom.db.Database; import org.eclipse.cdt.internal.core.pdom.db.PDOMStringSet; +import junit.framework.Test; + // copy/pasted from BTreeTests public class PDOMStringSetTests extends BaseTestCase { protected File dbFile; diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/RaceCondition157992Test.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/RaceCondition157992Test.java index 049b1f0a84e..c83a91e2286 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/RaceCondition157992Test.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/RaceCondition157992Test.java @@ -18,8 +18,6 @@ package org.eclipse.cdt.internal.pdom.tests; import java.util.regex.Pattern; -import junit.framework.Test; - import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.index.IndexFilter; import org.eclipse.cdt.core.model.ICProject; @@ -27,6 +25,8 @@ import org.eclipse.cdt.internal.core.CCoreInternals; import org.eclipse.cdt.internal.core.pdom.PDOM; import org.eclipse.core.runtime.NullProgressMonitor; +import junit.framework.Test; + /** * Test case for a race condition from Bugzilla#157992 */ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/TypesTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/TypesTests.java index 52d837ed592..00cfdd60c14 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/TypesTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/TypesTests.java @@ -16,8 +16,6 @@ package org.eclipse.cdt.internal.pdom.tests; import java.util.regex.Pattern; -import junit.framework.Test; - import org.eclipse.cdt.core.dom.IName; import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IBinding; @@ -33,6 +31,8 @@ import org.eclipse.cdt.internal.core.CCoreInternals; import org.eclipse.cdt.internal.core.pdom.PDOM; import org.eclipse.core.runtime.NullProgressMonitor; +import junit.framework.Test; + /** * @author Doug Schaefer * diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/ProjectCreator.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/ProjectCreator.java index 5036344e910..cf61de926d6 100644 --- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/ProjectCreator.java +++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/ProjectCreator.java @@ -20,8 +20,6 @@ import java.util.Enumeration; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import junit.framework.TestCase; - import org.eclipse.cdt.core.testplugin.CTestPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; @@ -33,6 +31,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; +import junit.framework.TestCase; + /** * This is a utility class that properly creates a project for testing * core features. Projects are created from a template stored in a zip file diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CElementDecorator.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CElementDecorator.java index a21507016ad..de7373ffeb2 100644 --- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CElementDecorator.java +++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CElementDecorator.java @@ -13,10 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.core.testplugin; -import org.eclipse.swt.graphics.Image; - import org.eclipse.jface.viewers.ILabelDecorator; import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.swt.graphics.Image; /** * Allows to test decorators for Java elements diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/FailureDialog.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/FailureDialog.java index c89c37e4257..2ce3b4b7e70 100644 --- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/FailureDialog.java +++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/FailureDialog.java @@ -13,6 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.core.testplugin.util; +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.resource.JFaceResources; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; @@ -21,10 +24,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.resource.JFaceResources; - /* * A dialog for collecting notes from the tester regarding * the failure of a test. diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/ProjectLanguageConfiguration.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/ProjectLanguageConfiguration.java index a3b319a296e..b26fe8b42a4 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/ProjectLanguageConfiguration.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/ProjectLanguageConfiguration.java @@ -16,8 +16,8 @@ package org.eclipse.cdt.core.language; import java.util.Collections; import java.util.Iterator; import java.util.Map; -import java.util.TreeMap; import java.util.Map.Entry; +import java.util.TreeMap; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.core.resources.IFile; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BatchOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BatchOperation.java index 7b9c1ff7da9..bddec3b23f8 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BatchOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BatchOperation.java @@ -13,11 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.model; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICModelStatus; import org.eclipse.core.resources.IResourceStatus; import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.core.runtime.CoreException; -import org.eclipse.cdt.core.model.ICModelStatus; -import org.eclipse.cdt.core.model.CModelException; /** * An operation created as a result of a call to JavaCore.run(IWorkspaceRunnable, IProgressMonitor) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateMemberOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateMemberOperation.java index d3513aa9a08..4b54d36118c 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateMemberOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateMemberOperation.java @@ -14,8 +14,8 @@ package org.eclipse.cdt.internal.core.model; -import org.eclipse.cdt.core.model.IStructure; import org.eclipse.cdt.core.model.ICModelStatus; +import org.eclipse.cdt.core.model.IStructure; /** * Implements functionality common to diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Structure.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Structure.java index 2f432cf5266..f1dde496fa8 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Structure.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Structure.java @@ -13,6 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.model; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; + import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.IField; @@ -20,11 +25,6 @@ import org.eclipse.cdt.core.model.IMethodDeclaration; import org.eclipse.cdt.core.model.IStructure; import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; - public class Structure extends StructureDeclaration implements IStructure { Map<String, ASTAccessVisibility> superClassesNames = new TreeMap<String, ASTAccessVisibility>(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ext/CElementHandle.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ext/CElementHandle.java index e902c16b7bb..27eb4594d91 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ext/CElementHandle.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ext/CElementHandle.java @@ -14,6 +14,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.model.ext; +import java.net.URI; +import java.util.Collections; +import java.util.List; + import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.IPositionConverter; import org.eclipse.cdt.core.dom.ast.ASTTypeUtil; @@ -38,10 +42,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.Region; -import java.net.URI; -import java.util.Collections; -import java.util.List; - abstract class CElementHandle implements ICElementHandle, ISourceReference { protected static final String[] EMPTY_STRING_ARRAY = {}; private static final ICElement[] NO_CHILDREN = {}; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/AbstractCProjectDescriptionStorage.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/AbstractCProjectDescriptionStorage.java index ac19ffb72ee..4a6e8d9bebe 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/AbstractCProjectDescriptionStorage.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/AbstractCProjectDescriptionStorage.java @@ -14,8 +14,6 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.settings.model; -import com.ibm.icu.text.MessageFormat; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.settings.model.CProjectDescriptionEvent; @@ -36,6 +34,8 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.osgi.framework.Version; +import com.ibm.icu.text.MessageFormat; + /** * This abstract class provides an extension point for functionality for loading * a CDT Project Description from some kind of backing store. This allows diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateName.java index c70fe4b39d5..39829999050 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateName.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateName.java @@ -10,8 +10,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.dom.ast.cpp; -import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTName; - /** * This interface represents template names which use the template disambiguator * keyword. diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/AbstractCPPParserExtensionConfiguration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/AbstractCPPParserExtensionConfiguration.java index 6ea696e59ef..c5d434714d8 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/AbstractCPPParserExtensionConfiguration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/AbstractCPPParserExtensionConfiguration.java @@ -16,14 +16,14 @@ *******************************************************************************/ package org.eclipse.cdt.core.dom.parser.cpp; +import java.util.Collections; +import java.util.Map; + import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; import org.eclipse.cdt.core.parser.IToken.ContextSensitiveTokenType; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.internal.core.dom.parser.GCCBuiltinSymbolProvider; -import java.util.Collections; -import java.util.Map; - /** * Abstract C++ parser extension configuration to help model C++ dialects. * diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/ExternalExportProjectProvider.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/ExternalExportProjectProvider.java index 49ac552c6c2..e6c17afcd31 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/ExternalExportProjectProvider.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/ExternalExportProjectProvider.java @@ -22,9 +22,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.ibm.icu.text.DateFormat; -import com.ibm.icu.text.MessageFormat; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.index.IIndexLocationConverter; @@ -51,6 +48,9 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; +import com.ibm.icu.text.DateFormat; +import com.ibm.icu.text.MessageFormat; + /** * An IExportProjectProvider suitable for indexing an external folder. The arguments understood by this provider * are diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousDeclarator.java index de8ca346698..690d4e38a96 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousDeclarator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousDeclarator.java @@ -15,9 +15,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.parser.c; +import org.eclipse.cdt.core.dom.ast.IASTAttribute; import org.eclipse.cdt.core.dom.ast.IASTAttributeSpecifier; import org.eclipse.cdt.core.dom.ast.IASTDeclarator; -import org.eclipse.cdt.core.dom.ast.IASTAttribute; import org.eclipse.cdt.core.dom.ast.IASTInitializer; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTNode; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CArithmeticConversion.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CArithmeticConversion.java index 2ec8b3efda9..833dd418578 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CArithmeticConversion.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CArithmeticConversion.java @@ -14,8 +14,8 @@ package org.eclipse.cdt.internal.core.dom.parser.c; import org.eclipse.cdt.core.dom.ast.IBasicType; -import org.eclipse.cdt.core.dom.ast.IType; import org.eclipse.cdt.core.dom.ast.IBasicType.Kind; +import org.eclipse.cdt.core.dom.ast.IType; import org.eclipse.cdt.internal.core.dom.parser.ArithmeticConversion; public class CArithmeticConversion extends ArithmeticConversion { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumerator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumerator.java index 99c36696da2..ab2fc1c9155 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumerator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumerator.java @@ -26,8 +26,8 @@ import org.eclipse.cdt.core.dom.ast.IType; import org.eclipse.cdt.core.dom.ast.IValue; import org.eclipse.cdt.internal.core.dom.Linkage; import org.eclipse.cdt.internal.core.dom.parser.ASTEnumerator; -import org.eclipse.cdt.internal.core.dom.parser.ProblemBinding; import org.eclipse.cdt.internal.core.dom.parser.IntegralValue; +import org.eclipse.cdt.internal.core.dom.parser.ProblemBinding; import org.eclipse.core.runtime.PlatformObject; /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAttributeOwner.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAttributeOwner.java index d1838bb892e..ccf43c85960 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAttributeOwner.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAttributeOwner.java @@ -11,9 +11,8 @@ package org.eclipse.cdt.internal.core.dom.parser.cpp; import org.eclipse.cdt.core.dom.ast.IASTNode; -import org.eclipse.cdt.internal.core.dom.parser.IASTAmbiguityParent; - import org.eclipse.cdt.internal.core.dom.parser.ASTAttributeOwner; +import org.eclipse.cdt.internal.core.dom.parser.IASTAmbiguityParent; /** * C++ attribute owners. diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClosureType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClosureType.java index 3f3dc382d92..4a17ae5873c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClosureType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClosureType.java @@ -39,8 +39,8 @@ import org.eclipse.cdt.core.dom.ast.IType; import org.eclipse.cdt.core.dom.ast.ITypedef; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFunctionDeclarator; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLambdaExpression; -import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTParameterDeclaration; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLambdaExpression.CaptureDefault; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTParameterDeclaration; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateId; import org.eclipse.cdt.core.dom.ast.cpp.ICPPBase; import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassScope; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumerator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumerator.java index f0ab932aafd..41fc9dd9629 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumerator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumerator.java @@ -29,8 +29,8 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPEnumeration; import org.eclipse.cdt.internal.core.dom.Linkage; import org.eclipse.cdt.internal.core.dom.parser.ASTEnumerator; import org.eclipse.cdt.internal.core.dom.parser.IASTInternalEnumerationSpecifier; -import org.eclipse.cdt.internal.core.dom.parser.ProblemType; import org.eclipse.cdt.internal.core.dom.parser.IntegralValue; +import org.eclipse.cdt.internal.core.dom.parser.ProblemType; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; import org.eclipse.core.runtime.PlatformObject; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNodeFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNodeFactory.java index a929c58f638..176335f6c0b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNodeFactory.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNodeFactory.java @@ -68,7 +68,6 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCapture; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCatchHandler; -import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateName; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTClassVirtSpecifier; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier.ICPPASTBaseSpecifier; @@ -123,6 +122,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTStaticAssertDeclaration; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTSwitchStatement; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateDeclaration; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateId; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateName; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateSpecialization; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplatedTypeTemplateParameter; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTranslationUnit; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java index 2e1520d2772..1adf8819cce 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java @@ -84,7 +84,6 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTAttributeList; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCapture; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCatchHandler; -import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateName; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTClassVirtSpecifier; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier.ICPPASTBaseSpecifier; @@ -138,6 +137,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTStaticAssertDeclaration; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTSwitchStatement; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateDeclaration; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateId; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateName; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateParameter; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateSpecialization; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplatedTypeTemplateParameter; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPFunctionSet.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPFunctionSet.java index 3f85830e879..0c790cd01f0 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPFunctionSet.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPFunctionSet.java @@ -21,7 +21,6 @@ import org.eclipse.cdt.core.dom.ast.IScope; import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunction; import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateArgument; import org.eclipse.cdt.core.parser.util.ArrayUtil; -import org.eclipse.cdt.core.parser.util.CharArrayUtils; import org.eclipse.cdt.internal.core.dom.Linkage; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTNameBase; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPDeferredFunction; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/ExpressionTypes.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/ExpressionTypes.java index 4498ed7edb5..e882751221a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/ExpressionTypes.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/ExpressionTypes.java @@ -14,7 +14,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.parser.cpp.semantics; -import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.*; +import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.COND_TDEF; +import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.CVTYPE; +import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.REF; +import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.TDEF; import org.eclipse.cdt.core.dom.ast.IASTExpression.ValueCategory; import org.eclipse.cdt.core.dom.ast.IFunctionType; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/TypeTraits.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/TypeTraits.java index c49ce2ec56d..71af56c0d23 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/TypeTraits.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/TypeTraits.java @@ -20,6 +20,7 @@ import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUti import java.util.HashSet; import java.util.Set; +import org.eclipse.cdt.core.dom.ast.IASTExpression.ValueCategory; import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IArrayType; import org.eclipse.cdt.core.dom.ast.IBasicType; @@ -27,7 +28,6 @@ import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IEnumeration; import org.eclipse.cdt.core.dom.ast.IPointerType; import org.eclipse.cdt.core.dom.ast.IType; -import org.eclipse.cdt.core.dom.ast.IASTExpression.ValueCategory; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFunctionDefinition; import org.eclipse.cdt.core.dom.ast.cpp.ICPPBase; import org.eclipse.cdt.core.dom.ast.cpp.ICPPBasicType; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/TrackedNodePosition.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/TrackedNodePosition.java index 1c12494f050..47bd298b842 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/TrackedNodePosition.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/TrackedNodePosition.java @@ -14,12 +14,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.rewrite; -import org.eclipse.text.edits.TextEdit; -import org.eclipse.text.edits.TextEditGroup; - import org.eclipse.cdt.core.dom.rewrite.ITrackedNodePosition; import org.eclipse.cdt.internal.core.dom.parser.ASTNode; import org.eclipse.jface.text.IRegion; +import org.eclipse.text.edits.TextEdit; +import org.eclipse.text.edits.TextEditGroup; /** * @see org.eclipse.cdt.core.dom.rewrite.ITrackedNodePosition diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/ASTWriter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/ASTWriter.java index 6748ff4e388..a5d878e7b01 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/ASTWriter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/ASTWriter.java @@ -15,6 +15,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.rewrite.astwriter; +import java.util.List; + import org.eclipse.cdt.core.dom.ast.IASTASMDeclaration; import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement; import org.eclipse.cdt.core.dom.ast.IASTDeclarator; @@ -34,8 +36,6 @@ import org.eclipse.cdt.internal.core.dom.rewrite.changegenerator.ChangeGenerator import org.eclipse.cdt.internal.core.dom.rewrite.commenthandler.ASTCommenter; import org.eclipse.cdt.internal.core.dom.rewrite.commenthandler.NodeCommentMap; -import java.util.List; - /** * ASTWriter main class. Generates source code from <code>IASTNode</code>. * Uses a {@link ChangeGeneratorWriterVisitor} to generate the code for the given nodes. diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFactory.java index e0cfd3e94b0..b8bd5f7b64c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFactory.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFactory.java @@ -16,7 +16,16 @@ package org.eclipse.cdt.internal.core.index; -import static org.eclipse.cdt.core.index.IIndexManager.*; +import static org.eclipse.cdt.core.index.IIndexManager.ADD_DEPENDENCIES; +import static org.eclipse.cdt.core.index.IIndexManager.ADD_DEPENDENT; +import static org.eclipse.cdt.core.index.IIndexManager.ADD_EXTENSION_FRAGMENTS_ADD_IMPORT; +import static org.eclipse.cdt.core.index.IIndexManager.ADD_EXTENSION_FRAGMENTS_CALL_HIERARCHY; +import static org.eclipse.cdt.core.index.IIndexManager.ADD_EXTENSION_FRAGMENTS_CONTENT_ASSIST; +import static org.eclipse.cdt.core.index.IIndexManager.ADD_EXTENSION_FRAGMENTS_EDITOR; +import static org.eclipse.cdt.core.index.IIndexManager.ADD_EXTENSION_FRAGMENTS_INCLUDE_BROWSER; +import static org.eclipse.cdt.core.index.IIndexManager.ADD_EXTENSION_FRAGMENTS_NAVIGATION; +import static org.eclipse.cdt.core.index.IIndexManager.ADD_EXTENSION_FRAGMENTS_SEARCH; +import static org.eclipse.cdt.core.index.IIndexManager.ADD_EXTENSION_FRAGMENTS_TYPE_HIERARCHY; import java.util.ArrayList; import java.util.Collection; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/WritablePDOM.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/WritablePDOM.java index 0407740c5ce..6d95d6822ee 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/WritablePDOM.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/WritablePDOM.java @@ -15,6 +15,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.pdom; +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTNode; @@ -44,11 +49,6 @@ import org.eclipse.cdt.internal.core.pdom.dom.PDOMMacroReferenceName; import org.eclipse.cdt.internal.core.pdom.dom.PDOMName; import org.eclipse.core.runtime.CoreException; -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - public class WritablePDOM extends PDOM implements IWritableIndexFragment { private boolean fClearedBecauseOfVersionMismatch = false; private boolean fCreatedFromScratch = false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumerator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumerator.java index 2d4111ee81d..fd534e25004 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumerator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumerator.java @@ -20,8 +20,8 @@ import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IEnumerator; import org.eclipse.cdt.core.dom.ast.IType; import org.eclipse.cdt.core.dom.ast.IValue; -import org.eclipse.cdt.internal.core.dom.parser.ProblemType; import org.eclipse.cdt.internal.core.dom.parser.IntegralValue; +import org.eclipse.cdt.internal.core.dom.parser.ProblemType; import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalEnumerator; import org.eclipse.cdt.internal.core.index.IIndexCPPBindingConstants; import org.eclipse.cdt.internal.core.index.IIndexFragmentBinding; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumeratorSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumeratorSpecialization.java index 30b094686f2..d88538e1404 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumeratorSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumeratorSpecialization.java @@ -19,8 +19,8 @@ import org.eclipse.cdt.core.dom.ast.IEnumerator; import org.eclipse.cdt.core.dom.ast.IType; import org.eclipse.cdt.core.dom.ast.IValue; import org.eclipse.cdt.core.dom.ast.cpp.ICPPSpecialization; -import org.eclipse.cdt.internal.core.dom.parser.ProblemType; import org.eclipse.cdt.internal.core.dom.parser.IntegralValue; +import org.eclipse.cdt.internal.core.dom.parser.ProblemType; import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalEnumerator; import org.eclipse.cdt.internal.core.index.IIndexCPPBindingConstants; import org.eclipse.cdt.internal.core.index.IIndexFragmentBinding; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateTemplateParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateTemplateParameter.java index e780021457d..e096a4948f8 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateTemplateParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateTemplateParameter.java @@ -46,7 +46,6 @@ import org.eclipse.cdt.internal.core.pdom.db.Database; import org.eclipse.cdt.internal.core.pdom.db.PDOMNodeLinkedList; import org.eclipse.cdt.internal.core.pdom.dom.PDOMLinkage; import org.eclipse.cdt.internal.core.pdom.dom.PDOMNode; -import org.eclipse.cdt.internal.core.pdom.dom.cpp.PDOMCPPLinkage.ConfigureTemplateParameters; import org.eclipse.core.runtime.CoreException; /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/CLIUtil.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/CLIUtil.java index c63c5476c96..fd11cfcfeed 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/CLIUtil.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/CLIUtil.java @@ -13,7 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.pdom.export; -import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -22,6 +21,8 @@ import java.util.Map; import org.eclipse.cdt.core.index.export.Messages; import org.eclipse.core.runtime.CoreException; +import com.ibm.icu.text.MessageFormat; + /** * Helper methods for command-line options * <br> diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOMApplication.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOMApplication.java index 6c4b10051bc..a9942840597 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOMApplication.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOMApplication.java @@ -20,8 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.ibm.icu.text.MessageFormat; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMIndexerTask; import org.eclipse.cdt.core.dom.IPDOMManager; @@ -42,6 +40,8 @@ import org.eclipse.core.runtime.jobs.ProgressProvider; import org.eclipse.equinox.app.IApplication; import org.eclipse.equinox.app.IApplicationContext; +import com.ibm.icu.text.MessageFormat; + /** * An eclipse application for generating PDOM's without starting the Workbench */ diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TriggerNotificationTask.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TriggerNotificationTask.java index 42041fd7952..cbf36a68904 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TriggerNotificationTask.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TriggerNotificationTask.java @@ -16,9 +16,9 @@ package org.eclipse.cdt.internal.core.pdom.indexer; import org.eclipse.cdt.core.dom.IPDOMIndexer; import org.eclipse.cdt.core.dom.IPDOMIndexerTask; import org.eclipse.cdt.internal.core.pdom.IndexerProgress; +import org.eclipse.cdt.internal.core.pdom.PDOM.ChangeEvent; import org.eclipse.cdt.internal.core.pdom.PDOMManager; import org.eclipse.cdt.internal.core.pdom.WritablePDOM; -import org.eclipse.cdt.internal.core.pdom.PDOM.ChangeEvent; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/formatter/CodeFormatterApplication.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/formatter/CodeFormatterApplication.java index c4dd37e8f41..96b1ec4b5aa 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/formatter/CodeFormatterApplication.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/formatter/CodeFormatterApplication.java @@ -27,7 +27,6 @@ import java.util.Properties; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.ToolFactory; -import org.eclipse.cdt.core.formatter.CodeFormatter; import org.eclipse.core.runtime.content.IContentType; import org.eclipse.equinox.app.IApplication; import org.eclipse.equinox.app.IApplicationContext; diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/formatter/IndentManipulation.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/formatter/IndentManipulation.java index bb99f6d4190..38d13264d09 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/formatter/IndentManipulation.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/formatter/IndentManipulation.java @@ -22,7 +22,6 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.DefaultLineTracker; import org.eclipse.jface.text.ILineTracker; import org.eclipse.jface.text.IRegion; - import org.eclipse.text.edits.ReplaceEdit; /** diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CDTLogWriter.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CDTLogWriter.java index d9f8283d567..291a4854926 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CDTLogWriter.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CDTLogWriter.java @@ -22,14 +22,15 @@ import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.UnsupportedEncodingException; import java.io.Writer; -import com.ibm.icu.text.DateFormat; -import com.ibm.icu.text.SimpleDateFormat; import java.util.Date; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; +import com.ibm.icu.text.DateFormat; +import com.ibm.icu.text.SimpleDateFormat; + public class CDTLogWriter { protected File logFile = null; protected Writer log = null; diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessArgument.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessArgument.java index 83dccaf7310..d2118b2afee 100644 --- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessArgument.java +++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessArgument.java @@ -17,6 +17,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; + import org.eclipse.cdt.core.templateengine.TemplateCore; import org.eclipse.cdt.core.templateengine.TemplateEngine; import org.w3c.dom.Element; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryObject.java index 99b02b4c87c..bfafa3e2d20 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryObject.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryObject.java @@ -24,6 +24,7 @@ import org.eclipse.cdt.core.CConventions; import org.eclipse.cdt.core.IAddress; import org.eclipse.cdt.core.IBinaryParser; import org.eclipse.cdt.core.IBinaryParser.ISymbol; +import org.eclipse.cdt.utils.AR.ARHeader; import org.eclipse.cdt.utils.Addr2line; import org.eclipse.cdt.utils.Addr32; import org.eclipse.cdt.utils.CPPFilt; @@ -32,7 +33,6 @@ import org.eclipse.cdt.utils.ICygwinToolsFactroy; import org.eclipse.cdt.utils.NM; import org.eclipse.cdt.utils.Objdump; import org.eclipse.cdt.utils.Symbol; -import org.eclipse.cdt.utils.AR.ARHeader; import org.eclipse.cdt.utils.coff.Coff; import org.eclipse.cdt.utils.coff.PE; import org.eclipse.core.runtime.IPath; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryArchive.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryArchive.java index eddd84a74e4..59f695257fb 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryArchive.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryArchive.java @@ -20,8 +20,8 @@ import org.eclipse.cdt.core.IBinaryParser.IBinaryArchive; import org.eclipse.cdt.core.IBinaryParser.IBinaryFile; import org.eclipse.cdt.core.IBinaryParser.IBinaryObject; import org.eclipse.cdt.utils.AR; -import org.eclipse.cdt.utils.BinaryFile; import org.eclipse.cdt.utils.AR.ARHeader; +import org.eclipse.cdt.utils.BinaryFile; import org.eclipse.core.runtime.IPath; /** diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryObject.java index 0ce2e326d6e..4e90c1afee2 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryObject.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryObject.java @@ -22,9 +22,9 @@ import java.util.List; import org.eclipse.cdt.core.IAddressFactory; import org.eclipse.cdt.core.IBinaryParser; -import org.eclipse.cdt.core.ISymbolReader; import org.eclipse.cdt.core.IBinaryParser.IBinaryFile; import org.eclipse.cdt.core.IBinaryParser.ISymbol; +import org.eclipse.cdt.core.ISymbolReader; import org.eclipse.cdt.utils.AR; import org.eclipse.cdt.utils.Addr32; import org.eclipse.cdt.utils.Addr32Factory; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEParser.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEParser.java index f6b47c2c6ea..ea691ae0c4d 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEParser.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEParser.java @@ -22,8 +22,8 @@ import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.IBinaryParser; import org.eclipse.cdt.utils.AR; import org.eclipse.cdt.utils.coff.PE; -import org.eclipse.cdt.utils.coff.PEConstants; import org.eclipse.cdt.utils.coff.PE.Attribute; +import org.eclipse.cdt.utils.coff.PEConstants; import org.eclipse.core.runtime.IPath; /** diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/Stabs.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/Stabs.java index b746d8009a7..c58c5ad96a5 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/Stabs.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/Stabs.java @@ -21,8 +21,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.eclipse.cdt.utils.coff.PE; import org.eclipse.cdt.utils.coff.Coff.SectionHeader; +import org.eclipse.cdt.utils.coff.PE; import org.eclipse.cdt.utils.coff.PE.Attribute; import org.eclipse.cdt.utils.debug.DebugArrayType; import org.eclipse.cdt.utils.debug.DebugBaseType; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/Elf.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/Elf.java index d53d1c1b320..e66e6fbf6e5 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/Elf.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/Elf.java @@ -18,6 +18,14 @@ import static org.eclipse.cdt.internal.core.ByteUtils.makeInt; import static org.eclipse.cdt.internal.core.ByteUtils.makeLong; import static org.eclipse.cdt.internal.core.ByteUtils.makeShort; +import java.io.EOFException; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.channels.FileChannel.MapMode; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; + import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.IAddress; import org.eclipse.cdt.core.IAddressFactory; @@ -29,14 +37,6 @@ import org.eclipse.cdt.utils.Addr64Factory; import org.eclipse.cdt.utils.ERandomAccessFile; import org.eclipse.cdt.utils.debug.dwarf.DwarfReader; -import java.io.EOFException; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.channels.FileChannel.MapMode; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; - public class Elf { public final static int ELF32_ADDR_SIZE = 4; public final static int ELF32_OFF_SIZE = 4; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryArchive.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryArchive.java index bfa32202fb2..d6187558eac 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryArchive.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryArchive.java @@ -22,8 +22,8 @@ import org.eclipse.cdt.core.IBinaryParser.IBinaryArchive; import org.eclipse.cdt.core.IBinaryParser.IBinaryFile; import org.eclipse.cdt.core.IBinaryParser.IBinaryObject; import org.eclipse.cdt.utils.AR; -import org.eclipse.cdt.utils.BinaryFile; import org.eclipse.cdt.utils.AR.ARHeader; +import org.eclipse.cdt.utils.BinaryFile; import org.eclipse.core.runtime.IPath; /** diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryObject.java index 150bdc44774..1bbc905b2cf 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryObject.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryObject.java @@ -22,9 +22,9 @@ import java.util.List; import org.eclipse.cdt.core.IAddressFactory; import org.eclipse.cdt.core.IBinaryParser; -import org.eclipse.cdt.core.ISymbolReader; import org.eclipse.cdt.core.IBinaryParser.IBinaryFile; import org.eclipse.cdt.core.IBinaryParser.ISymbol; +import org.eclipse.cdt.core.ISymbolReader; import org.eclipse.cdt.utils.AR; import org.eclipse.cdt.utils.Addr32Factory; import org.eclipse.cdt.utils.BinaryObjectAdapter; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfParser.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfParser.java index d9fce61e42d..413295e5b34 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfParser.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfParser.java @@ -15,8 +15,8 @@ *******************************************************************************/ package org.eclipse.cdt.utils.elf.parser; -import static org.eclipse.cdt.internal.core.ByteUtils.makeShort; import static org.eclipse.cdt.internal.core.ByteUtils.makeInt; +import static org.eclipse.cdt.internal.core.ByteUtils.makeShort; import java.io.EOFException; import java.io.IOException; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfBinaryObject.java index 69350ff9bd1..5966e721772 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfBinaryObject.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfBinaryObject.java @@ -20,12 +20,12 @@ import java.util.List; import org.eclipse.cdt.core.IAddress; import org.eclipse.cdt.core.IBinaryParser; +import org.eclipse.cdt.utils.AR.ARHeader; import org.eclipse.cdt.utils.Addr2line; import org.eclipse.cdt.utils.CPPFilt; import org.eclipse.cdt.utils.IGnuToolFactory; import org.eclipse.cdt.utils.Objdump; import org.eclipse.cdt.utils.Symbol; -import org.eclipse.cdt.utils.AR.ARHeader; import org.eclipse.cdt.utils.elf.Elf; import org.eclipse.cdt.utils.elf.ElfHelper; import org.eclipse.core.runtime.IPath; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/MachO64.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/MachO64.java index 8cfbb268c8d..1ab56e9a822 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/MachO64.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/MachO64.java @@ -26,8 +26,8 @@ import java.util.Set; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.ISymbolReader; import org.eclipse.cdt.utils.CPPFilt; -import org.eclipse.cdt.utils.debug.stabs.StabsReader; import org.eclipse.cdt.utils.debug.stabs.StabConstant; +import org.eclipse.cdt.utils.debug.stabs.StabsReader; /** * @since 5.2 diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryObject.java index fbb1b9ff62a..2b235133272 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryObject.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryObject.java @@ -25,9 +25,9 @@ import java.util.List; import org.eclipse.cdt.core.IAddress; import org.eclipse.cdt.core.IAddressFactory; import org.eclipse.cdt.core.IBinaryParser; -import org.eclipse.cdt.core.ISymbolReader; import org.eclipse.cdt.core.IBinaryParser.IBinaryFile; import org.eclipse.cdt.core.IBinaryParser.ISymbol; +import org.eclipse.cdt.core.ISymbolReader; import org.eclipse.cdt.utils.Addr32; import org.eclipse.cdt.utils.Addr32Factory; import org.eclipse.cdt.utils.BinaryObjectAdapter; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryObject64.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryObject64.java index ab5b44bc8ce..4d1eb0b35d9 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryObject64.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryObject64.java @@ -26,9 +26,9 @@ import java.util.List; import org.eclipse.cdt.core.IAddress; import org.eclipse.cdt.core.IAddressFactory; import org.eclipse.cdt.core.IBinaryParser; -import org.eclipse.cdt.core.ISymbolReader; import org.eclipse.cdt.core.IBinaryParser.IBinaryFile; import org.eclipse.cdt.core.IBinaryParser.ISymbol; +import org.eclipse.cdt.core.ISymbolReader; import org.eclipse.cdt.utils.Addr32; import org.eclipse.cdt.utils.Addr32Factory; import org.eclipse.cdt.utils.Addr64; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryObject.java index fd59885b5b5..d37e43b01d7 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryObject.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryObject.java @@ -34,8 +34,8 @@ import org.eclipse.cdt.utils.IGnuToolFactory; import org.eclipse.cdt.utils.Objdump; import org.eclipse.cdt.utils.Symbol; import org.eclipse.cdt.utils.som.AR; -import org.eclipse.cdt.utils.som.SOM; import org.eclipse.cdt.utils.som.AR.ARHeader; +import org.eclipse.cdt.utils.som.SOM; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/XCoff32.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/XCoff32.java index 01761bc3c73..c7c31e9a0e8 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/XCoff32.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/XCoff32.java @@ -16,13 +16,14 @@ package org.eclipse.cdt.utils.xcoff; import java.io.EOFException; import java.io.IOException; import java.io.RandomAccessFile; -import com.ibm.icu.text.DateFormat; import java.util.ArrayList; import java.util.Date; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.utils.coff.ReadMemoryAccess; +import com.ibm.icu.text.DateFormat; + /** * Representation of AIX XCOFF32 binary format * diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/CElementDecorator.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/CElementDecorator.java index 1f22c270b81..9c62c6a3a96 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/CElementDecorator.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/CElementDecorator.java @@ -13,10 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.ui.testplugin; -import org.eclipse.swt.graphics.Image; - import org.eclipse.jface.viewers.ILabelDecorator; import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.swt.graphics.Image; /** * Allows to test decorators for Java elements diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/DisplayHelper.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/DisplayHelper.java index 51f349ab784..2df162ba308 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/DisplayHelper.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/DisplayHelper.java @@ -16,10 +16,10 @@ package org.eclipse.cdt.ui.testplugin; import java.util.logging.Level; import java.util.logging.Logger; -import junit.framework.Assert; - import org.eclipse.swt.widgets.Display; +import junit.framework.Assert; + /** * Runs the event loop of the given display until {@link #condition()} becomes * <code>true</code> or no events have occurred for the supplied timeout. diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/EditorTestHelper.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/EditorTestHelper.java index 6fe945339cb..dc7d1d72d12 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/EditorTestHelper.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/EditorTestHelper.java @@ -22,6 +22,16 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.IPDOMManager; +import org.eclipse.cdt.core.index.IIndexManager; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.core.testplugin.ResourceHelper; +import org.eclipse.cdt.internal.ui.text.CReconcilingStrategy; +import org.eclipse.cdt.internal.ui.text.CompositeReconcilingStrategy; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; @@ -71,18 +81,6 @@ import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider; import org.eclipse.ui.wizards.datatransfer.ImportOperation; import org.junit.Assert; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.IPDOMManager; -import org.eclipse.cdt.core.index.IIndexManager; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.core.testplugin.ResourceHelper; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; - -import org.eclipse.cdt.internal.ui.text.CReconcilingStrategy; -import org.eclipse.cdt.internal.ui.text.CompositeReconcilingStrategy; - /** * Copied from org.eclipse.jdt.text.tests.performance. * diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/FileTool.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/FileTool.java index 6899cb05804..93af20bb6fc 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/FileTool.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/FileTool.java @@ -29,13 +29,12 @@ import java.util.Enumeration; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; +import org.eclipse.core.filebuffers.FileBuffers; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Plugin; -import org.eclipse.core.filebuffers.FileBuffers; - /** * Copied from org.eclipse.core.filebuffers.tests. * diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/FailureDialog.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/FailureDialog.java index 8ea4be325af..bca9e82e870 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/FailureDialog.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/FailureDialog.java @@ -13,6 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.ui.testplugin.util; +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.resource.JFaceResources; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; @@ -21,10 +24,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.resource.JFaceResources; - /* * A dialog for collecting notes from the tester regarding * the failure of a test. diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPPPopulateASTViewAction.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPPPopulateASTViewAction.java index cdcd6a04580..82d5508e483 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPPPopulateASTViewAction.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPPPopulateASTViewAction.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.DOMAST; -import org.eclipse.core.runtime.IProgressMonitor; - import org.eclipse.cdt.core.dom.ast.ASTGenericVisitor; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTNode; @@ -25,8 +23,8 @@ import org.eclipse.cdt.core.dom.ast.IASTProblem; import org.eclipse.cdt.core.dom.ast.IASTProblemHolder; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.parser.util.ArrayUtil; - import org.eclipse.cdt.internal.core.dom.parser.ASTNode; +import org.eclipse.core.runtime.IProgressMonitor; /** * @author dsteffle diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPopulateASTViewAction.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPopulateASTViewAction.java index c15f15cf67c..eb31f95f041 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPopulateASTViewAction.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPopulateASTViewAction.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.DOMAST; -import org.eclipse.core.runtime.IProgressMonitor; - import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTArrayDeclarator; import org.eclipse.cdt.core.dom.ast.IASTArrayModifier; @@ -38,8 +36,8 @@ import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.ast.IASTTypeId; import org.eclipse.cdt.core.dom.ast.c.ICASTDesignator; import org.eclipse.cdt.core.parser.util.ArrayUtil; - import org.eclipse.cdt.internal.core.dom.parser.ASTNode; +import org.eclipse.core.runtime.IProgressMonitor; /** * @author dsteffle diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMAST.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMAST.java index 4ea392b2120..20b6b3e0cba 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMAST.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMAST.java @@ -13,6 +13,47 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.DOMAST; +import org.eclipse.cdt.core.dom.ast.ASTTypeUtil; +import org.eclipse.cdt.core.dom.ast.ASTVisitor; +import org.eclipse.cdt.core.dom.ast.IASTArrayModifier; +import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTDeclaration; +import org.eclipse.cdt.core.dom.ast.IASTDeclarator; +import org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier.IASTEnumerator; +import org.eclipse.cdt.core.dom.ast.IASTExpression; +import org.eclipse.cdt.core.dom.ast.IASTInitializer; +import org.eclipse.cdt.core.dom.ast.IASTName; +import org.eclipse.cdt.core.dom.ast.IASTNode; +import org.eclipse.cdt.core.dom.ast.IASTParameterDeclaration; +import org.eclipse.cdt.core.dom.ast.IASTPointerOperator; +import org.eclipse.cdt.core.dom.ast.IASTPreprocessorStatement; +import org.eclipse.cdt.core.dom.ast.IASTProblem; +import org.eclipse.cdt.core.dom.ast.IASTProblemDeclaration; +import org.eclipse.cdt.core.dom.ast.IASTProblemExpression; +import org.eclipse.cdt.core.dom.ast.IASTProblemStatement; +import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration; +import org.eclipse.cdt.core.dom.ast.IASTStatement; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.dom.ast.IASTTypeId; +import org.eclipse.cdt.core.dom.ast.IFunction; +import org.eclipse.cdt.core.dom.ast.IType; +import org.eclipse.cdt.core.dom.ast.IVariable; +import org.eclipse.cdt.core.dom.ast.c.ICASTDesignator; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTConstructorChainInitializer; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTConstructorInitializer; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateParameter; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.parser.ParserUtil; +import org.eclipse.cdt.core.resources.FileStorage; +import org.eclipse.cdt.internal.core.dom.parser.c.CASTTranslationUnit; +import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTTranslationUnit; +import org.eclipse.cdt.internal.core.model.ASTStringUtil; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.ui.actions.CustomFiltersActionGroup; +import org.eclipse.cdt.ui.testplugin.CTestPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; @@ -65,50 +106,6 @@ import org.eclipse.ui.part.ViewPart; import org.eclipse.ui.texteditor.AbstractTextEditor; import org.eclipse.ui.views.properties.PropertySheet; -import org.eclipse.cdt.core.dom.ast.ASTTypeUtil; -import org.eclipse.cdt.core.dom.ast.ASTVisitor; -import org.eclipse.cdt.core.dom.ast.IASTArrayModifier; -import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier; -import org.eclipse.cdt.core.dom.ast.IASTDeclaration; -import org.eclipse.cdt.core.dom.ast.IASTDeclarator; -import org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier.IASTEnumerator; -import org.eclipse.cdt.core.dom.ast.IASTExpression; -import org.eclipse.cdt.core.dom.ast.IASTInitializer; -import org.eclipse.cdt.core.dom.ast.IASTName; -import org.eclipse.cdt.core.dom.ast.IASTNode; -import org.eclipse.cdt.core.dom.ast.IASTParameterDeclaration; -import org.eclipse.cdt.core.dom.ast.IASTPointerOperator; -import org.eclipse.cdt.core.dom.ast.IASTPreprocessorStatement; -import org.eclipse.cdt.core.dom.ast.IASTProblem; -import org.eclipse.cdt.core.dom.ast.IASTProblemDeclaration; -import org.eclipse.cdt.core.dom.ast.IASTProblemExpression; -import org.eclipse.cdt.core.dom.ast.IASTProblemStatement; -import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration; -import org.eclipse.cdt.core.dom.ast.IASTStatement; -import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.ast.IASTTypeId; -import org.eclipse.cdt.core.dom.ast.IFunction; -import org.eclipse.cdt.core.dom.ast.IType; -import org.eclipse.cdt.core.dom.ast.IVariable; -import org.eclipse.cdt.core.dom.ast.c.ICASTDesignator; -import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTConstructorChainInitializer; -import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTConstructorInitializer; -import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateParameter; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.parser.ParserUtil; -import org.eclipse.cdt.core.resources.FileStorage; -import org.eclipse.cdt.ui.actions.CustomFiltersActionGroup; -import org.eclipse.cdt.ui.testplugin.CTestPlugin; - -import org.eclipse.cdt.internal.core.dom.parser.c.CASTTranslationUnit; -import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTTranslationUnit; -import org.eclipse.cdt.internal.core.model.ASTStringUtil; - -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.util.EditorUtility; - /** * This is a simple DOM AST View used for development testing. */ diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTNodeLeaf.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTNodeLeaf.java index e82aae61915..a95d2ab179c 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTNodeLeaf.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTNodeLeaf.java @@ -21,11 +21,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.ui.views.properties.IPropertyDescriptor; -import org.eclipse.ui.views.properties.IPropertySource; -import org.eclipse.ui.views.properties.TextPropertyDescriptor; - import org.eclipse.cdt.core.dom.ast.ASTNodeProperty; import org.eclipse.cdt.core.dom.ast.ASTTypeUtil; import org.eclipse.cdt.core.dom.ast.DOMException; @@ -60,9 +55,12 @@ import org.eclipse.cdt.core.dom.ast.c.ICASTFieldDesignator; import org.eclipse.cdt.core.dom.ast.gnu.c.IGCCASTArrayRangeDesignator; import org.eclipse.cdt.core.parser.Keywords; import org.eclipse.cdt.core.parser.util.ArrayUtil; - import org.eclipse.cdt.internal.core.dom.parser.ASTNode; import org.eclipse.cdt.internal.core.model.ASTStringUtil; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.ui.views.properties.IPropertyDescriptor; +import org.eclipse.ui.views.properties.IPropertySource; +import org.eclipse.ui.views.properties.TextPropertyDescriptor; /** * @author dsteffle diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTNodeParent.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTNodeParent.java index c7375f0d05c..578f6b4cd71 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTNodeParent.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTNodeParent.java @@ -20,7 +20,6 @@ import org.eclipse.cdt.core.dom.ast.IASTNodeLocation; import org.eclipse.cdt.core.dom.ast.IASTPreprocessorStatement; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.parser.util.ArrayUtil; - import org.eclipse.cdt.internal.core.dom.parser.ASTNode; /** diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/FindIASTNameDialog.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/FindIASTNameDialog.java index 31497df2154..797545fc729 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/FindIASTNameDialog.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/FindIASTNameDialog.java @@ -17,6 +17,15 @@ import java.util.ArrayList; import java.util.List; import java.util.regex.PatternSyntaxException; +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.dialogs.IDialogSettings; +import org.eclipse.jface.resource.JFaceColors; +import org.eclipse.jface.text.IFindReplaceTarget; +import org.eclipse.jface.text.IFindReplaceTargetExtension; +import org.eclipse.jface.text.IFindReplaceTargetExtension3; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; +import org.eclipse.jface.text.TextUtilities; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -36,18 +45,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; - -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.IDialogSettings; -import org.eclipse.jface.resource.JFaceColors; - -import org.eclipse.jface.text.IFindReplaceTarget; -import org.eclipse.jface.text.IFindReplaceTargetExtension; -import org.eclipse.jface.text.IFindReplaceTargetExtension3; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.Region; -import org.eclipse.jface.text.TextUtilities; - import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/FindIASTNameTarget.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/FindIASTNameTarget.java index 9669c53b1a3..4bf95d24c96 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/FindIASTNameTarget.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/FindIASTNameTarget.java @@ -18,20 +18,18 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.eclipse.jface.text.IFindReplaceTarget; -import org.eclipse.jface.text.IFindReplaceTargetExtension3; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.widgets.TreeItem; - import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTPreprocessorMacroDefinition; import org.eclipse.cdt.core.dom.ast.IASTPreprocessorStatement; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; - import org.eclipse.cdt.internal.core.dom.parser.ASTNode; +import org.eclipse.jface.text.IFindReplaceTarget; +import org.eclipse.jface.text.IFindReplaceTargetExtension3; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.widgets.TreeItem; /** * @author dsteffle diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/OpenDOMViewAction.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/OpenDOMViewAction.java index f536f218ee2..10d0f652ed3 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/OpenDOMViewAction.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/OpenDOMViewAction.java @@ -13,6 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.DOMAST; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ISourceReference; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.util.EditorUtility; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; @@ -24,13 +29,6 @@ import org.eclipse.ui.IViewPart; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.PartInitException; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ISourceReference; -import org.eclipse.cdt.core.model.ITranslationUnit; - -import org.eclipse.cdt.internal.ui.util.EditorUtility; - /** * @author dsteffle */ diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/ShowInDOMViewAction.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/ShowInDOMViewAction.java index 636a102f6cd..01171a1154b 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/ShowInDOMViewAction.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/ShowInDOMViewAction.java @@ -14,6 +14,13 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.DOMAST; +import org.eclipse.cdt.core.dom.ast.IASTFileLocation; +import org.eclipse.cdt.core.dom.ast.IASTNode; +import org.eclipse.cdt.core.dom.ast.IASTNodeLocation; +import org.eclipse.cdt.core.dom.ast.IASTPreprocessorIncludeStatement; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.ui.testplugin.CTestPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IPath; import org.eclipse.jface.action.IAction; @@ -32,15 +39,6 @@ import org.eclipse.ui.editors.text.ILocationProvider; import org.eclipse.ui.ide.ResourceUtil; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.core.dom.ast.IASTFileLocation; -import org.eclipse.cdt.core.dom.ast.IASTNode; -import org.eclipse.cdt.core.dom.ast.IASTNodeLocation; -import org.eclipse.cdt.core.dom.ast.IASTPreprocessorIncludeStatement; -import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.ui.testplugin.CTestPlugin; - -import org.eclipse.cdt.internal.ui.editor.CEditor; - /** * @author dsteffle */ diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveFunctionBodiesHandler.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveFunctionBodiesHandler.java index a7913d2eae7..d80047ac624 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveFunctionBodiesHandler.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveFunctionBodiesHandler.java @@ -13,6 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.reducer; +import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.cdt.internal.ui.refactoring.RefactoringRunner; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.ICEditor; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; @@ -21,12 +25,6 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.handlers.HandlerUtil; -import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.ICEditor; - -import org.eclipse.cdt.internal.ui.refactoring.RefactoringRunner; - public class RemoveFunctionBodiesHandler extends AbstractHandler { @Override public Object execute(ExecutionEvent event) throws ExecutionException { diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveFunctionBodiesRefactoring.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveFunctionBodiesRefactoring.java index b202fe3cf95..8fab7f9e874 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveFunctionBodiesRefactoring.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveFunctionBodiesRefactoring.java @@ -16,22 +16,6 @@ package org.eclipse.cdt.ui.tests.reducer; import java.util.ArrayList; import java.util.List; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.SubMonitor; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.Region; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.ltk.core.refactoring.Change; -import org.eclipse.ltk.core.refactoring.RefactoringChangeDescriptor; -import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; -import org.eclipse.ltk.core.refactoring.RefactoringStatus; -import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; -import org.eclipse.text.edits.DeleteEdit; -import org.eclipse.text.edits.MultiTextEdit; -import org.eclipse.text.edits.ReplaceEdit; - import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier; import org.eclipse.cdt.core.dom.ast.IASTDeclaration; @@ -52,16 +36,29 @@ import org.eclipse.cdt.core.formatter.DefaultCodeFormatterOptions; import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.refactoring.CTextFileChange; - import org.eclipse.cdt.internal.core.dom.parser.ASTNode; import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding; import org.eclipse.cdt.internal.core.dom.rewrite.util.ASTNodes; - import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; import org.eclipse.cdt.internal.ui.refactoring.ModificationCollector; import org.eclipse.cdt.internal.ui.refactoring.changes.CCompositeChange; import org.eclipse.cdt.internal.ui.refactoring.utils.SelectionHelper; +import org.eclipse.cdt.ui.refactoring.CTextFileChange; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.core.runtime.SubMonitor; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.ltk.core.refactoring.Change; +import org.eclipse.ltk.core.refactoring.RefactoringChangeDescriptor; +import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; +import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; +import org.eclipse.text.edits.DeleteEdit; +import org.eclipse.text.edits.MultiTextEdit; +import org.eclipse.text.edits.ReplaceEdit; public class RemoveFunctionBodiesRefactoring extends CRefactoring { private static final String PROTECTION_TOKEN = "PRESERVE"; diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveFunctionBodiesRefactoringRunner.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveFunctionBodiesRefactoringRunner.java index e3c35f2aee5..1132b5511ff 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveFunctionBodiesRefactoringRunner.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveFunctionBodiesRefactoringRunner.java @@ -13,14 +13,12 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.reducer; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.window.IShellProvider; - import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; - import org.eclipse.cdt.internal.ui.refactoring.RefactoringRunner; import org.eclipse.cdt.internal.ui.refactoring.RefactoringSaveHelper; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.window.IShellProvider; public class RemoveFunctionBodiesRefactoringRunner extends RefactoringRunner { diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveFunctionBodiesWizard.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveFunctionBodiesWizard.java index 63a5b070074..551dad234f3 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveFunctionBodiesWizard.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveFunctionBodiesWizard.java @@ -13,9 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.reducer; -import org.eclipse.ltk.ui.refactoring.RefactoringWizard; - import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.ltk.ui.refactoring.RefactoringWizard; public class RemoveFunctionBodiesWizard extends RefactoringWizard { public RemoveFunctionBodiesWizard(RemoveFunctionBodiesRefactoring refactoring) { diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsHandler.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsHandler.java index e01fdc0ea81..9f56dc6b077 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsHandler.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsHandler.java @@ -13,6 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.reducer; +import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.cdt.internal.ui.refactoring.RefactoringRunner; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.ICEditor; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; @@ -21,12 +25,6 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.handlers.HandlerUtil; -import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.ICEditor; - -import org.eclipse.cdt.internal.ui.refactoring.RefactoringRunner; - public class RemoveUnusedDeclarationsHandler extends AbstractHandler { @Override public Object execute(ExecutionEvent event) throws ExecutionException { diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsInputPage.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsInputPage.java index 96e4b6e07d8..160537697d6 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsInputPage.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsInputPage.java @@ -13,6 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.reducer; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.internal.ui.dialogs.TextFieldNavigationHandler; +import org.eclipse.cdt.internal.ui.util.RowLayouter; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.ltk.ui.refactoring.UserInputWizardPage; import org.eclipse.swt.SWT; @@ -23,10 +26,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.internal.ui.dialogs.TextFieldNavigationHandler; -import org.eclipse.cdt.internal.ui.util.RowLayouter; - public class RemoveUnusedDeclarationsInputPage extends UserInputWizardPage { public static final String PAGE_NAME = "RemoveUnusedDeclarationsInputPage"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsRefactoring.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsRefactoring.java index 16388b1350b..10ce31c4bbe 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsRefactoring.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsRefactoring.java @@ -25,22 +25,6 @@ import java.util.NavigableSet; import java.util.Set; import java.util.TreeSet; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.SubMonitor; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.Region; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.ltk.core.refactoring.Change; -import org.eclipse.ltk.core.refactoring.RefactoringChangeDescriptor; -import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; -import org.eclipse.ltk.core.refactoring.RefactoringStatus; -import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; -import org.eclipse.text.edits.DeleteEdit; -import org.eclipse.text.edits.MultiTextEdit; -import org.eclipse.text.edits.TextEdit; - import org.eclipse.cdt.core.dom.ast.ASTNodeProperty; import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; @@ -89,17 +73,30 @@ import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.parser.util.CharArrayUtils; -import org.eclipse.cdt.ui.refactoring.CTextFileChange; - import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTName; import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding; import org.eclipse.cdt.internal.core.dom.rewrite.util.ASTNodes; - import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; import org.eclipse.cdt.internal.ui.refactoring.ModificationCollector; import org.eclipse.cdt.internal.ui.refactoring.changes.CCompositeChange; import org.eclipse.cdt.internal.ui.refactoring.utils.SelectionHelper; +import org.eclipse.cdt.ui.refactoring.CTextFileChange; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.core.runtime.SubMonitor; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.ltk.core.refactoring.Change; +import org.eclipse.ltk.core.refactoring.RefactoringChangeDescriptor; +import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; +import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; +import org.eclipse.text.edits.DeleteEdit; +import org.eclipse.text.edits.MultiTextEdit; +import org.eclipse.text.edits.TextEdit; public class RemoveUnusedDeclarationsRefactoring extends CRefactoring { private static final String PROTECTION_TOKEN = "PRESERVE"; diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsRefactoringRunner.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsRefactoringRunner.java index 1704ffbf393..f00fd90d8f5 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsRefactoringRunner.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsRefactoringRunner.java @@ -13,14 +13,12 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.reducer; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.window.IShellProvider; - import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; - import org.eclipse.cdt.internal.ui.refactoring.RefactoringRunner; import org.eclipse.cdt.internal.ui.refactoring.RefactoringSaveHelper; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.window.IShellProvider; public class RemoveUnusedDeclarationsRefactoringRunner extends RefactoringRunner { diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsWizard.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsWizard.java index 7d3aa9198f8..6efd72e26cc 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsWizard.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsWizard.java @@ -13,9 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.reducer; -import org.eclipse.ltk.ui.refactoring.RefactoringWizard; - import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.ltk.ui.refactoring.RefactoringWizard; public class RemoveUnusedDeclarationsWizard extends RefactoringWizard { public RemoveUnusedDeclarationsWizard(RemoveUnusedDeclarationsRefactoring refactoring) { diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TemplateEngineTestsHelper.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TemplateEngineTestsHelper.java index b6fa3ae9fb0..60d31e69e96 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TemplateEngineTestsHelper.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TemplateEngineTestsHelper.java @@ -18,8 +18,6 @@ import java.net.URL; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; - import org.eclipse.cdt.core.templateengine.TemplateCore; import org.eclipse.cdt.core.templateengine.TemplateDescriptor; import org.eclipse.cdt.core.templateengine.TemplateEngine; @@ -36,6 +34,8 @@ import org.osgi.framework.Bundle; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; +import junit.framework.Assert; + /** * All supporting functions which are not part of Testing class. * diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestExtraPagesProvider.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestExtraPagesProvider.java index 8380002ceb8..f1da4a6efe0 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestExtraPagesProvider.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestExtraPagesProvider.java @@ -17,6 +17,9 @@ package org.eclipse.cdt.ui.tests.templateengine; import java.util.Collections; import java.util.Map; +import org.eclipse.cdt.ui.templateengine.AbstractWizardDataPage; +import org.eclipse.cdt.ui.templateengine.IPagesAfterTemplateSelectionProvider; +import org.eclipse.cdt.ui.templateengine.IWizardDataPage; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; @@ -24,10 +27,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchWizard; -import org.eclipse.cdt.ui.templateengine.AbstractWizardDataPage; -import org.eclipse.cdt.ui.templateengine.IPagesAfterTemplateSelectionProvider; -import org.eclipse.cdt.ui.templateengine.IWizardDataPage; - /** * An example implementation of {@link IPagesAfterTemplateSelectionProvider} for * testing purposes. diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestSharedDefaults.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestSharedDefaults.java index af7e5ded2fd..19084032772 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestSharedDefaults.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestSharedDefaults.java @@ -18,13 +18,12 @@ import java.util.List; import javax.xml.parsers.DocumentBuilderFactory; -import org.w3c.dom.Document; -import org.w3c.dom.Element; - import org.eclipse.cdt.core.templateengine.SharedDefaults; import org.eclipse.cdt.core.templateengine.TemplateEngine; import org.eclipse.cdt.core.templateengine.TemplateEngineHelper; import org.eclipse.cdt.core.testplugin.util.BaseTestCase; +import org.w3c.dom.Document; +import org.w3c.dom.Element; /** * Executes all the test cases of SharedDefaults backend functionality diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/AnnotationTestCase.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/AnnotationTestCase.java index b0521ec42c6..499e76b365d 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/AnnotationTestCase.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/AnnotationTestCase.java @@ -16,6 +16,9 @@ package org.eclipse.cdt.ui.tests; import java.io.File; import java.util.Iterator; +import org.eclipse.cdt.core.parser.util.ArrayUtil; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.ui.testplugin.EditorTestHelper; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.text.BadLocationException; @@ -26,11 +29,6 @@ import org.eclipse.jface.text.source.Annotation; import org.eclipse.jface.text.source.IAnnotationModel; import org.eclipse.ui.PartInitException; -import org.eclipse.cdt.core.parser.util.ArrayUtil; -import org.eclipse.cdt.ui.testplugin.EditorTestHelper; - -import org.eclipse.cdt.internal.ui.editor.CEditor; - /** * Base class for tests. If you want to use outside of this plugin, you need * to override {@link #getPlugin()} method and maybe {@link #getSourcePrefix()} diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java index fc8b86f2656..a33b833762a 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java @@ -17,6 +17,14 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.testplugin.util.BaseTestCase; +import org.eclipse.cdt.core.testplugin.util.TestSourceReader; +import org.eclipse.cdt.ui.testplugin.CTestPlugin; +import org.eclipse.cdt.ui.testplugin.util.StringAsserts; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.NotEnabledException; import org.eclipse.core.commands.NotHandledException; @@ -46,15 +54,6 @@ import org.eclipse.ui.WorkbenchException; import org.eclipse.ui.handlers.IHandlerService; import org.eclipse.ui.internal.WorkbenchPartReference; -import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.index.IIndex; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.testplugin.util.BaseTestCase; -import org.eclipse.cdt.core.testplugin.util.TestSourceReader; -import org.eclipse.cdt.ui.testplugin.CTestPlugin; -import org.eclipse.cdt.ui.testplugin.util.StringAsserts; - public class BaseUITestCase extends BaseTestCase { public BaseUITestCase() { super(); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/UITestCaseWithProject.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/UITestCaseWithProject.java index 8dc052baaab..e2b01844a5c 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/UITestCaseWithProject.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/UITestCaseWithProject.java @@ -20,6 +20,13 @@ import java.io.FileInputStream; import java.io.IOException; import java.util.ArrayList; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.IPDOMManager; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.core.testplugin.FileManager; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -31,14 +38,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.IPDOMManager; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.core.testplugin.FileManager; - public class UITestCaseWithProject extends BaseUITestCase { ArrayList<File> tempFiles = new ArrayList<>(); protected File tmpDir; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/buildconsole/BuildConsolePartitionerEditDataTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/buildconsole/BuildConsolePartitionerEditDataTest.java index 05f2972cc31..9730d6c57ce 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/buildconsole/BuildConsolePartitionerEditDataTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/buildconsole/BuildConsolePartitionerEditDataTest.java @@ -25,15 +25,13 @@ import static org.mockito.Mockito.mock; import java.util.Arrays; -import org.junit.Before; -import org.junit.Test; - import org.eclipse.cdt.core.ProblemMarkerInfo; - import org.eclipse.cdt.internal.ui.buildconsole.BuildConsolePartition; import org.eclipse.cdt.internal.ui.buildconsole.BuildConsolePartitionerEditData; import org.eclipse.cdt.internal.ui.buildconsole.BuildConsolePartitionerEditData.UpdateUIData; import org.eclipse.cdt.internal.ui.buildconsole.IBuildConsoleStreamDecorator; +import org.junit.Before; +import org.junit.Test; public class BuildConsolePartitionerEditDataTest { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/buildconsole/BuildConsoleTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/buildconsole/BuildConsoleTests.java index d16c1065560..fc0b17ea039 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/buildconsole/BuildConsoleTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/buildconsole/BuildConsoleTests.java @@ -15,27 +15,25 @@ package org.eclipse.cdt.ui.tests.buildconsole; import java.io.IOException; -import junit.framework.TestSuite; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.ui.console.ConsolePlugin; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.resources.IConsole; import org.eclipse.cdt.core.testplugin.ResourceHelper; +import org.eclipse.cdt.internal.ui.buildconsole.BuildConsole; +import org.eclipse.cdt.internal.ui.buildconsole.BuildConsolePage; +import org.eclipse.cdt.internal.ui.buildconsole.ConsoleMessages; +import org.eclipse.cdt.internal.ui.buildconsole.GlobalBuildConsoleManager; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.IBuildConsoleManager; import org.eclipse.cdt.ui.testplugin.Accessor; import org.eclipse.cdt.ui.testplugin.DisplayHelper; import org.eclipse.cdt.ui.tests.BaseUITestCase; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.ui.console.ConsolePlugin; -import org.eclipse.cdt.internal.ui.buildconsole.BuildConsole; -import org.eclipse.cdt.internal.ui.buildconsole.BuildConsolePage; -import org.eclipse.cdt.internal.ui.buildconsole.ConsoleMessages; -import org.eclipse.cdt.internal.ui.buildconsole.GlobalBuildConsoleManager; +import junit.framework.TestSuite; /** * BuildConsoleTests. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/BasicCallHierarchyTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/BasicCallHierarchyTest.java index 57b327eb14e..93abb77af63 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/BasicCallHierarchyTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/BasicCallHierarchyTest.java @@ -15,21 +15,18 @@ package org.eclipse.cdt.ui.tests.callhierarchy; import java.io.IOException; -import junit.framework.Test; - -import org.eclipse.core.resources.IFile; -import org.eclipse.swt.widgets.Tree; -import org.eclipse.swt.widgets.TreeItem; -import org.eclipse.ui.PartInitException; - import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.testplugin.CProjectHelper; - import org.eclipse.cdt.internal.core.model.CoreModelMessages; - import org.eclipse.cdt.internal.ui.callhierarchy.CHNode; import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.core.resources.IFile; +import org.eclipse.swt.widgets.Tree; +import org.eclipse.swt.widgets.TreeItem; +import org.eclipse.ui.PartInitException; + +import junit.framework.Test; public class BasicCallHierarchyTest extends CallHierarchyBaseTest { private static final String ANON = CoreModelMessages.getString("CElementLabels.anonymous"); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/BasicCppCallHierarchyTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/BasicCppCallHierarchyTest.java index fead1a6d144..a60fe3e604b 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/BasicCppCallHierarchyTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/BasicCppCallHierarchyTest.java @@ -13,12 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.callhierarchy; -import junit.framework.Test; - +import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.core.resources.IFile; import org.eclipse.swt.widgets.Tree; -import org.eclipse.cdt.internal.ui.editor.CEditor; +import junit.framework.Test; public class BasicCppCallHierarchyTest extends CallHierarchyBaseTest { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyAcrossProjectsTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyAcrossProjectsTest.java index 52e60855ed4..1933fd6fe43 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyAcrossProjectsTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyAcrossProjectsTest.java @@ -13,8 +13,12 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.callhierarchy; -import junit.framework.Test; - +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.IPDOMManager; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.core.testplugin.TestScannerProvider; +import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.core.resources.IFile; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.swt.widgets.Tree; @@ -22,13 +26,7 @@ import org.eclipse.swt.widgets.TreeItem; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.IPDOMManager; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.core.testplugin.TestScannerProvider; - -import org.eclipse.cdt.internal.ui.editor.CEditor; +import junit.framework.Test; public class CallHierarchyAcrossProjectsTest extends CallHierarchyBaseTest { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBaseTest.java index b59ff658a99..426e3a21ffa 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBaseTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBaseTest.java @@ -13,6 +13,17 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.callhierarchy; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.IPDOMManager; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.internal.ui.callhierarchy.CHViewPart; +import org.eclipse.cdt.internal.ui.callhierarchy.CallHierarchyUI; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.testplugin.EditorTestHelper; +import org.eclipse.cdt.ui.tests.BaseUITestCase; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.jobs.Job; @@ -26,19 +37,6 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.ide.IDE; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.IPDOMManager; -import org.eclipse.cdt.core.index.IIndex; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.testplugin.EditorTestHelper; -import org.eclipse.cdt.ui.tests.BaseUITestCase; - -import org.eclipse.cdt.internal.ui.callhierarchy.CHViewPart; -import org.eclipse.cdt.internal.ui.callhierarchy.CallHierarchyUI; -import org.eclipse.cdt.internal.ui.editor.CEditor; - public class CallHierarchyBaseTest extends BaseUITestCase { private static int sProjectCounter = 0; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBugs.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBugs.java index d12156951d7..f3399fc7344 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBugs.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBugs.java @@ -13,8 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.callhierarchy; -import junit.framework.Test; - +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.internal.ui.callhierarchy.CHViewPart; +import org.eclipse.cdt.internal.ui.callhierarchy.CallHierarchyUI; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeItem; @@ -22,12 +25,7 @@ import org.eclipse.ui.IPageLayout; import org.eclipse.ui.IViewPart; import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.callhierarchy.CHViewPart; -import org.eclipse.cdt.internal.ui.callhierarchy.CallHierarchyUI; -import org.eclipse.cdt.internal.ui.editor.CEditor; +import junit.framework.Test; public class CallHierarchyBugs extends CallHierarchyBaseTest { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CppCallHierarchyTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CppCallHierarchyTest.java index 23b562be0c5..e55520d6f14 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CppCallHierarchyTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CppCallHierarchyTest.java @@ -13,8 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.callhierarchy; -import junit.framework.Test; - +import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.core.resources.IFile; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.swt.widgets.Tree; @@ -22,7 +21,7 @@ import org.eclipse.swt.widgets.TreeItem; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.internal.ui.editor.CEditor; +import junit.framework.Test; public class CppCallHierarchyTest extends CallHierarchyBaseTest { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/InitializersInCallHierarchyTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/InitializersInCallHierarchyTest.java index 5e1e5f46088..47da86884c5 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/InitializersInCallHierarchyTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/InitializersInCallHierarchyTest.java @@ -13,12 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.callhierarchy; -import junit.framework.Test; - +import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.core.resources.IFile; import org.eclipse.swt.widgets.Tree; -import org.eclipse.cdt.internal.ui.editor.CEditor; +import junit.framework.Test; public class InitializersInCallHierarchyTest extends CallHierarchyBaseTest { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/extension/CHContentProvider.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/extension/CHContentProvider.java index 4e6dd0b9c88..bb9a167e02f 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/extension/CHContentProvider.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/extension/CHContentProvider.java @@ -13,12 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.callhierarchy.extension; -import org.eclipse.jface.viewers.IOpenListener; - import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.ui.ICHEContentProvider; - import org.eclipse.cdt.internal.core.model.ext.FunctionDeclarationHandle; +import org.eclipse.cdt.ui.ICHEContentProvider; +import org.eclipse.jface.viewers.IOpenListener; /** * This class implements ICHEProvider and provides test information diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/extension/CHExtensionTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/extension/CHExtensionTest.java index b491de120c1..a516ace255d 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/extension/CHExtensionTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/extension/CHExtensionTest.java @@ -13,6 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.callhierarchy.extension; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.tests.callhierarchy.CallHierarchyBaseTest; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.resource.ImageDescriptor; @@ -20,11 +23,6 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Tree; import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.tests.callhierarchy.CallHierarchyBaseTest; - -import org.eclipse.cdt.internal.ui.editor.CEditor; - import junit.framework.TestSuite; /** diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/extension/CHLabelProvider.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/extension/CHLabelProvider.java index 8aba8cbc111..72e86cab914 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/extension/CHLabelProvider.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/extension/CHLabelProvider.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.callhierarchy.extension; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.StyledCellLabelProvider; @@ -20,9 +22,6 @@ import org.eclipse.jface.viewers.StyledString; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.ui.CUIPlugin; - public class CHLabelProvider implements IStyledLabelProvider { public static String ICON_PATH = "$nl$/icons/obj16/container_obj.gif"; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/extension/CHOpenListener.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/extension/CHOpenListener.java index fee90a326b3..c70d5240fd2 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/extension/CHOpenListener.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/extension/CHOpenListener.java @@ -15,6 +15,8 @@ package org.eclipse.cdt.ui.tests.callhierarchy.extension; import java.util.HashMap; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.ui.testplugin.CTestPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; import org.eclipse.core.runtime.CoreException; @@ -35,9 +37,6 @@ import org.eclipse.ui.ide.IDE; import org.eclipse.ui.part.FileEditorInput; import org.eclipse.ui.progress.UIJob; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.testplugin.CTestPlugin; - public class CHOpenListener implements IOpenListener { /** On Node click open corresponding file */ diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/extension/DslNode.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/extension/DslNode.java index 0f69f900871..8f4c271019e 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/extension/DslNode.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/extension/DslNode.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.callhierarchy.extension; -import org.eclipse.core.runtime.IAdaptable; - import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.ui.ICHENode; +import org.eclipse.core.runtime.IAdaptable; /** * The dsl node sample diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpProviderTester.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpProviderTester.java index b5c1fc4d14d..0c3f125b721 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpProviderTester.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpProviderTester.java @@ -22,21 +22,19 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.Platform; -import org.eclipse.help.IHelpResource; -import org.junit.Assert; - +import org.eclipse.cdt.internal.ui.CHelpProviderManager; +import org.eclipse.cdt.internal.ui.text.CHelpBookDescriptor; +import org.eclipse.cdt.internal.ui.text.CHelpSettings; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.ICHelpBook; import org.eclipse.cdt.ui.ICHelpResourceDescriptor; import org.eclipse.cdt.ui.IFunctionSummary; import org.eclipse.cdt.ui.IRequiredInclude; import org.eclipse.cdt.ui.text.ICHelpInvocationContext; - -import org.eclipse.cdt.internal.ui.CHelpProviderManager; -import org.eclipse.cdt.internal.ui.text.CHelpBookDescriptor; -import org.eclipse.cdt.internal.ui.text.CHelpSettings; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.Platform; +import org.eclipse.help.IHelpResource; +import org.junit.Assert; /** * diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpTest.java index d371d6d09fe..b16f2bb1c65 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpTest.java @@ -16,25 +16,23 @@ package org.eclipse.cdt.ui.tests.chelp; import java.io.PrintWriter; import java.io.StringWriter; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.Platform; -import org.junit.Assert; - import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.internal.ui.CHelpProviderManager; +import org.eclipse.cdt.internal.ui.text.CHelpBookDescriptor; +import org.eclipse.cdt.internal.ui.text.CHelpSettings; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.ICHelpBook; import org.eclipse.cdt.ui.ICHelpResourceDescriptor; import org.eclipse.cdt.ui.IFunctionSummary; import org.eclipse.cdt.ui.text.ICHelpInvocationContext; - -import org.eclipse.cdt.internal.ui.CHelpProviderManager; -import org.eclipse.cdt.internal.ui.text.CHelpBookDescriptor; -import org.eclipse.cdt.internal.ui.text.CHelpSettings; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.Platform; +import org.junit.Assert; import junit.framework.Test; import junit.framework.TestCase; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpTestInfoProvider.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpTestInfoProvider.java index 93d026d9040..69586c60b4e 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpTestInfoProvider.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpTestInfoProvider.java @@ -13,13 +13,12 @@ **********************************************************************/ package org.eclipse.cdt.ui.tests.chelp; -import org.junit.Assert; - import org.eclipse.cdt.ui.ICHelpBook; import org.eclipse.cdt.ui.ICHelpProvider; import org.eclipse.cdt.ui.ICHelpResourceDescriptor; import org.eclipse.cdt.ui.IFunctionSummary; import org.eclipse.cdt.ui.text.ICHelpInvocationContext; +import org.junit.Assert; /** * This class implements ICHelpProvider and provides test information diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/editor/SourceHeaderPartnerFinderTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/editor/SourceHeaderPartnerFinderTest.java index f80bc53d86d..e33cc8adcf5 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/editor/SourceHeaderPartnerFinderTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/editor/SourceHeaderPartnerFinderTest.java @@ -13,19 +13,17 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.editor; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.NullProgressMonitor; - import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.ui.tests.BaseUITestCase; - import org.eclipse.cdt.internal.ui.editor.SourceHeaderPartnerFinder; +import org.eclipse.cdt.ui.tests.BaseUITestCase; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.NullProgressMonitor; /** * Tests for org.eclipse.cdt.internal.ui.editor.SourceHeaderPartnerFinder. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/BasicIncludeBrowserTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/BasicIncludeBrowserTest.java index 788feceab1b..231a76af2db 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/BasicIncludeBrowserTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/BasicIncludeBrowserTest.java @@ -14,18 +14,17 @@ package org.eclipse.cdt.ui.tests.includebrowser; -import junit.framework.Test; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.swt.widgets.Tree; -import org.eclipse.swt.widgets.TreeItem; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.TestScannerProvider; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.swt.widgets.Tree; +import org.eclipse.swt.widgets.TreeItem; + +import junit.framework.Test; public class BasicIncludeBrowserTest extends IncludeBrowserBaseTest { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserBaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserBaseTest.java index 8197d45c680..5bcec9942b7 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserBaseTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserBaseTest.java @@ -13,14 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.includebrowser; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.swt.widgets.Tree; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.index.IIndex; @@ -28,10 +20,16 @@ import org.eclipse.cdt.core.model.CoreModelUtil; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.internal.ui.includebrowser.IBViewPart; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.tests.BaseUITestCase; - -import org.eclipse.cdt.internal.ui.includebrowser.IBViewPart; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.swt.widgets.Tree; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; public class IncludeBrowserBaseTest extends BaseUITestCase { protected static IProgressMonitor NPM = new NullProgressMonitor(); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/misc/CDTSharedImagesTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/misc/CDTSharedImagesTests.java index 7dc09d7b30c..8a390ec571b 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/misc/CDTSharedImagesTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/misc/CDTSharedImagesTests.java @@ -18,8 +18,8 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.net.URL; -import junit.framework.TestCase; - +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; @@ -27,8 +27,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IDecoration; import org.eclipse.swt.graphics.Image; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; +import junit.framework.TestCase; /** * Tests for CDT shared images repository. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/misc/LanguageVerifierTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/misc/LanguageVerifierTests.java index 2afc9582709..3a3a929ff52 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/misc/LanguageVerifierTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/misc/LanguageVerifierTests.java @@ -17,13 +17,12 @@ package org.eclipse.cdt.ui.tests.misc; import java.util.HashMap; import java.util.Map; -import junit.framework.TestCase; - import org.eclipse.cdt.core.language.WorkspaceLanguageConfiguration; import org.eclipse.cdt.core.model.ILanguage; - import org.eclipse.cdt.internal.ui.language.LanguageVerifier; +import junit.framework.TestCase; + /** * Tests for CDT Language Verifier. */ diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/outline/BasicOutlineTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/outline/BasicOutlineTest.java index 08c9861d3c9..0f8e75ff4d4 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/outline/BasicOutlineTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/outline/BasicOutlineTest.java @@ -13,8 +13,14 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.outline; -import junit.framework.TestSuite; - +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.IPDOMManager; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.testplugin.EditorTestHelper; +import org.eclipse.cdt.ui.tests.BaseUITestCase; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; @@ -27,15 +33,7 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.ide.IDE; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.IPDOMManager; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.testplugin.EditorTestHelper; -import org.eclipse.cdt.ui.tests.BaseUITestCase; - -import org.eclipse.cdt.internal.ui.editor.CEditor; +import junit.framework.TestSuite; /** * Basic outline view tests. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/quickfix/AssistQuickFixTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/quickfix/AssistQuickFixTest.java index 24c8bfff8b3..ab6032e1dc0 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/quickfix/AssistQuickFixTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/quickfix/AssistQuickFixTest.java @@ -19,10 +19,23 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import junit.extensions.TestSetup; -import junit.framework.Test; -import junit.framework.TestSuite; - +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.parser.IProblem; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.text.correction.CCorrectionProcessor; +import org.eclipse.cdt.internal.ui.text.correction.CorrectionContext; +import org.eclipse.cdt.internal.ui.text.correction.ProblemLocation; +import org.eclipse.cdt.internal.ui.text.correction.proposals.LinkedNamesAssistProposal; +import org.eclipse.cdt.internal.ui.text.correction.proposals.RenameRefactoringProposal; +import org.eclipse.cdt.internal.ui.text.correction.proposals.TUCorrectionProposal; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.testplugin.EditorTestHelper; +import org.eclipse.cdt.ui.tests.BaseUITestCase; +import org.eclipse.cdt.ui.text.ICCompletionProposal; +import org.eclipse.cdt.ui.text.IInvocationContext; +import org.eclipse.cdt.ui.text.IProblemLocation; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; @@ -38,24 +51,9 @@ import org.eclipse.jface.text.source.SourceViewer; import org.eclipse.swt.custom.StyledText; import org.eclipse.ui.PartInitException; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.parser.IProblem; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.testplugin.EditorTestHelper; -import org.eclipse.cdt.ui.tests.BaseUITestCase; -import org.eclipse.cdt.ui.text.ICCompletionProposal; -import org.eclipse.cdt.ui.text.IInvocationContext; -import org.eclipse.cdt.ui.text.IProblemLocation; - -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.text.correction.CCorrectionProcessor; -import org.eclipse.cdt.internal.ui.text.correction.CorrectionContext; -import org.eclipse.cdt.internal.ui.text.correction.ProblemLocation; -import org.eclipse.cdt.internal.ui.text.correction.proposals.LinkedNamesAssistProposal; -import org.eclipse.cdt.internal.ui.text.correction.proposals.RenameRefactoringProposal; -import org.eclipse.cdt.internal.ui.text.correction.proposals.TUCorrectionProposal; +import junit.extensions.TestSetup; +import junit.framework.Test; +import junit.framework.TestSuite; public class AssistQuickFixTest extends BaseUITestCase { private static final Class<AssistQuickFixTest> THIS = AssistQuickFixTest.class; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringTestBase.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringTestBase.java index 95f51174724..b3535711220 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringTestBase.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringTestBase.java @@ -22,6 +22,20 @@ import java.util.LinkedHashSet; import java.util.Set; import java.util.regex.Pattern; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.IPDOMManager; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.core.testplugin.TestScannerProvider; +import org.eclipse.cdt.core.testplugin.util.BaseTestCase; +import org.eclipse.cdt.core.testplugin.util.TestSourceReader; +import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; +import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContext; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.testplugin.CTestPlugin; import org.eclipse.core.filesystem.URIUtil; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -41,22 +55,6 @@ import org.eclipse.ltk.core.refactoring.history.RefactoringHistory; import org.eclipse.ltk.internal.core.refactoring.history.RefactoringHistoryService; import org.osgi.framework.Bundle; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.IPDOMManager; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.core.testplugin.TestScannerProvider; -import org.eclipse.cdt.core.testplugin.util.BaseTestCase; -import org.eclipse.cdt.core.testplugin.util.TestSourceReader; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.testplugin.CTestPlugin; - -import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; -import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContext; - /** * Common base for refactoring tests. */ diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringTestSuite.java index 0759874cf90..5c4c250369c 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringTestSuite.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringTestSuite.java @@ -17,9 +17,6 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.refactoring; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - import org.eclipse.cdt.ui.tests.refactoring.extractconstant.ExtractConstantRefactoringTest; import org.eclipse.cdt.ui.tests.refactoring.extractfunction.ExtractFunctionRefactoringTest; import org.eclipse.cdt.ui.tests.refactoring.extractlocalvariable.ExtractLocalVariableRefactoringTest; @@ -30,6 +27,8 @@ import org.eclipse.cdt.ui.tests.refactoring.includes.IncludesTestSuite; import org.eclipse.cdt.ui.tests.refactoring.rename.RenameRegressionTests; import org.eclipse.cdt.ui.tests.refactoring.togglefunction.ToggleRefactoringTest; import org.eclipse.cdt.ui.tests.refactoring.utils.UtilTestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; /** * @author Emanuel Graf diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractconstant/ExtractConstantRefactoringTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractconstant/ExtractConstantRefactoringTest.java index aa4bc987c2d..bb18826035a 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractconstant/ExtractConstantRefactoringTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractconstant/ExtractConstantRefactoringTest.java @@ -16,20 +16,19 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.refactoring.extractconstant; -import junit.framework.Test; - import java.util.Arrays; import java.util.function.Predicate; -import org.eclipse.core.runtime.CoreException; -import org.junit.Before; - -import org.eclipse.cdt.ui.tests.refactoring.RefactoringTestBase; import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContext; import org.eclipse.cdt.internal.ui.refactoring.extractconstant.ExtractConstantInfo; import org.eclipse.cdt.internal.ui.refactoring.extractconstant.ExtractConstantRefactoring; import org.eclipse.cdt.internal.ui.refactoring.utils.VisibilityEnum; +import org.eclipse.cdt.ui.tests.refactoring.RefactoringTestBase; +import org.eclipse.core.runtime.CoreException; +import org.junit.Before; + +import junit.framework.Test; /** * Tests for Extract Constant refactoring. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractfunction/ExtractFunctionRefactoringTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractfunction/ExtractFunctionRefactoringTest.java index 1200ff71cad..4c43dab6595 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractfunction/ExtractFunctionRefactoringTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractfunction/ExtractFunctionRefactoringTest.java @@ -19,14 +19,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.tests.refactoring.RefactoringTestBase; - import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; import org.eclipse.cdt.internal.ui.refactoring.NameInformation; import org.eclipse.cdt.internal.ui.refactoring.extractfunction.ExtractFunctionInformation; import org.eclipse.cdt.internal.ui.refactoring.extractfunction.ExtractFunctionRefactoring; import org.eclipse.cdt.internal.ui.refactoring.utils.VisibilityEnum; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.tests.refactoring.RefactoringTestBase; import junit.framework.Test; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractlocalvariable/ExtractLocalVariableRefactoringTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractlocalvariable/ExtractLocalVariableRefactoringTest.java index 70a7c343d39..6818907ded3 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractlocalvariable/ExtractLocalVariableRefactoringTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractlocalvariable/ExtractLocalVariableRefactoringTest.java @@ -17,12 +17,11 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.refactoring.extractlocalvariable; -import junit.framework.Test; - -import org.eclipse.cdt.ui.tests.refactoring.RefactoringTestBase; - import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; import org.eclipse.cdt.internal.ui.refactoring.extractlocalvariable.ExtractLocalVariableRefactoring; +import org.eclipse.cdt.ui.tests.refactoring.RefactoringTestBase; + +import junit.framework.Test; /** * Tests for Extract Local Variable refactoring. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/gettersandsetters/GenerateGettersAndSettersTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/gettersandsetters/GenerateGettersAndSettersTest.java index 5c84c152dac..5dfa2671daf 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/gettersandsetters/GenerateGettersAndSettersTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/gettersandsetters/GenerateGettersAndSettersTest.java @@ -16,15 +16,14 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.refactoring.gettersandsetters; -import junit.framework.Test; - -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.tests.refactoring.RefactoringTestBase; - import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; import org.eclipse.cdt.internal.ui.refactoring.gettersandsetters.AccessorDescriptor.AccessorKind; import org.eclipse.cdt.internal.ui.refactoring.gettersandsetters.GenerateGettersAndSettersRefactoring; import org.eclipse.cdt.internal.ui.refactoring.gettersandsetters.GetterSetterContext; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.tests.refactoring.RefactoringTestBase; + +import junit.framework.Test; /** * Tests for Generate Getters and Setters refactoring. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/hidemethod/HideMethodRefactoringTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/hidemethod/HideMethodRefactoringTest.java index 4f86d367a2f..a1fca1866a0 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/hidemethod/HideMethodRefactoringTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/hidemethod/HideMethodRefactoringTest.java @@ -15,12 +15,11 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.refactoring.hidemethod; -import junit.framework.Test; - -import org.eclipse.cdt.ui.tests.refactoring.RefactoringTestBase; - import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; import org.eclipse.cdt.internal.ui.refactoring.hidemethod.HideMethodRefactoring; +import org.eclipse.cdt.ui.tests.refactoring.RefactoringTestBase; + +import junit.framework.Test; /** * Tests for Extract Local Variable refactoring. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/implementmethod/ImplementMethodRefactoringTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/implementmethod/ImplementMethodRefactoringTest.java index d826cc4e05d..d08b9778366 100755 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/implementmethod/ImplementMethodRefactoringTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/implementmethod/ImplementMethodRefactoringTest.java @@ -15,12 +15,11 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.refactoring.implementmethod; -import junit.framework.Test; - -import org.eclipse.cdt.ui.tests.refactoring.RefactoringTestBase; - import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; import org.eclipse.cdt.internal.ui.refactoring.implementmethod.ImplementMethodRefactoring; +import org.eclipse.cdt.ui.tests.refactoring.RefactoringTestBase; + +import junit.framework.Test; /** * Tests for Extract Local Variable refactoring. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/includes/BindingClassifierTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/includes/BindingClassifierTest.java index 46cc2a07117..c24281ac673 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/includes/BindingClassifierTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/includes/BindingClassifierTest.java @@ -19,10 +19,6 @@ import java.util.List; import java.util.Set; import java.util.TreeSet; -import org.eclipse.jface.preference.IPreferenceStore; - -import com.ibm.icu.text.MessageFormat; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.ast.DOMException; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; @@ -34,12 +30,14 @@ import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.parser.util.StringUtil; import org.eclipse.cdt.core.testplugin.util.OneSourceMultipleHeadersTestCase; import org.eclipse.cdt.core.testplugin.util.TestSourceReader; +import org.eclipse.cdt.internal.ui.refactoring.includes.BindingClassifier; +import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeCreationContext; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.cdt.ui.testplugin.CTestPlugin; +import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.cdt.internal.ui.refactoring.includes.BindingClassifier; -import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeCreationContext; +import com.ibm.icu.text.MessageFormat; import junit.framework.TestSuite; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/includes/IncludeMapTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/includes/IncludeMapTest.java index bc49f15e6c6..ceea17ea753 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/includes/IncludeMapTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/includes/IncludeMapTest.java @@ -13,10 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.refactoring.includes; -import junit.framework.TestCase; - import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeMap; +import junit.framework.TestCase; + /** * Tests for {@link IncludeMap}. */ diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/includes/IncludeOrganizerTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/includes/IncludeOrganizerTest.java index cae1ce655f5..5d4ccece430 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/includes/IncludeOrganizerTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/includes/IncludeOrganizerTest.java @@ -15,19 +15,17 @@ package org.eclipse.cdt.ui.tests.refactoring.includes; import java.util.Collections; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.text.Document; -import org.eclipse.jface.text.IDocument; -import org.eclipse.text.edits.MultiTextEdit; - import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.PreferenceConstants; - import org.eclipse.cdt.internal.ui.refactoring.includes.HeaderSubstitutionMap; import org.eclipse.cdt.internal.ui.refactoring.includes.IHeaderChooser; import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeMap; import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeOrganizer; import org.eclipse.cdt.internal.ui.refactoring.includes.SymbolExportMap; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.jface.text.Document; +import org.eclipse.jface.text.IDocument; +import org.eclipse.text.edits.MultiTextEdit; import junit.framework.Test; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/includes/IncludesTestBase.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/includes/IncludesTestBase.java index 6d10caf08c4..880882dd204 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/includes/IncludesTestBase.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/includes/IncludesTestBase.java @@ -19,15 +19,6 @@ import java.util.Collection; import java.util.LinkedHashSet; import java.util.Set; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.QualifiedName; -import org.eclipse.jface.preference.IPreferenceStore; -import org.osgi.framework.Bundle; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; @@ -39,11 +30,18 @@ import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.TestScannerProvider; import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.cdt.core.testplugin.util.TestSourceReader; +import org.eclipse.cdt.internal.ui.refactoring.includes.IHeaderChooser; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.testplugin.CTestPlugin; import org.eclipse.cdt.ui.tests.refactoring.TestSourceFile; - -import org.eclipse.cdt.internal.ui.refactoring.includes.IHeaderChooser; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.QualifiedName; +import org.eclipse.jface.preference.IPreferenceStore; +import org.osgi.framework.Bundle; /** * Common base for include-related tests. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RefactoringTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RefactoringTests.java index 3b3b29e0ea8..3fd7d917ba3 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RefactoringTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RefactoringTests.java @@ -15,6 +15,10 @@ package org.eclipse.cdt.ui.tests.refactoring.rename; import java.io.StringWriter; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.IPDOMManager; +import org.eclipse.cdt.core.tests.BaseTestFramework; +import org.eclipse.cdt.internal.core.dom.SavedCodeReaderFactory; import org.eclipse.core.resources.IFile; import org.eclipse.ltk.core.refactoring.Change; import org.eclipse.ltk.core.refactoring.CompositeChange; @@ -28,12 +32,6 @@ import org.eclipse.text.edits.ReplaceEdit; import org.eclipse.text.edits.TextEdit; import org.eclipse.text.edits.TextEditGroup; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.IPDOMManager; -import org.eclipse.cdt.core.tests.BaseTestFramework; - -import org.eclipse.cdt.internal.core.dom.SavedCodeReaderFactory; - /** * @author markus.schorn@windriver.com */ diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameFunctionTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameFunctionTests.java index 00adfee3089..2ac8439cf6a 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameFunctionTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameFunctionTests.java @@ -15,13 +15,13 @@ package org.eclipse.cdt.ui.tests.refactoring.rename; import java.io.StringWriter; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.core.resources.IFile; import org.eclipse.ltk.core.refactoring.Change; import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import junit.framework.Test; +import junit.framework.TestSuite; + public class RenameFunctionTests extends RenameTestBase { public RenameFunctionTests(String name) { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameMacroTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameMacroTests.java index 8a87b6f7821..1ad9b31e956 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameMacroTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameMacroTests.java @@ -14,13 +14,13 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.refactoring.rename; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.core.resources.IFile; import org.eclipse.ltk.core.refactoring.Change; import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import junit.framework.Test; +import junit.framework.TestSuite; + public class RenameMacroTests extends RenameTestBase { public RenameMacroTests(String name) { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameMoveHeaderRefactoringTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameMoveHeaderRefactoringTest.java index 7a7f861300d..1012119bc3f 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameMoveHeaderRefactoringTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameMoveHeaderRefactoringTest.java @@ -13,8 +13,15 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.refactoring.rename; -import junit.framework.Test; - +import org.eclipse.cdt.core.model.ISourceRoot; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; +import org.eclipse.cdt.internal.ui.refactoring.rename.CRefactoringArgument; +import org.eclipse.cdt.internal.ui.refactoring.rename.CRefactory; +import org.eclipse.cdt.internal.ui.refactoring.rename.CRenameProcessor; +import org.eclipse.cdt.internal.ui.refactoring.rename.CRenameRefactoring; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.tests.refactoring.RefactoringTestBase; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IResource; @@ -24,16 +31,7 @@ import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring; import org.eclipse.ltk.internal.core.refactoring.resource.MoveResourcesProcessor; import org.eclipse.ltk.internal.core.refactoring.resource.RenameResourceProcessor; -import org.eclipse.cdt.core.model.ISourceRoot; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.tests.refactoring.RefactoringTestBase; - -import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; -import org.eclipse.cdt.internal.ui.refactoring.rename.CRefactoringArgument; -import org.eclipse.cdt.internal.ui.refactoring.rename.CRefactory; -import org.eclipse.cdt.internal.ui.refactoring.rename.CRenameProcessor; -import org.eclipse.cdt.internal.ui.refactoring.rename.CRenameRefactoring; +import junit.framework.Test; /** * Tests for diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameRegressionTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameRegressionTests.java index af4388180ce..f8a84ae072d 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameRegressionTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameRegressionTests.java @@ -16,17 +16,16 @@ package org.eclipse.cdt.ui.tests.refactoring.rename; import java.io.StringWriter; -import junit.framework.AssertionFailedError; -import junit.framework.Test; -import junit.framework.TestSuite; - +import org.eclipse.cdt.core.dom.ast.IBinding; +import org.eclipse.cdt.core.tests.FailingTest; import org.eclipse.core.resources.IFile; import org.eclipse.ltk.core.refactoring.Change; import org.eclipse.ltk.core.refactoring.RefactoringStatus; import org.eclipse.ltk.core.refactoring.participants.RenameArguments; -import org.eclipse.cdt.core.dom.ast.IBinding; -import org.eclipse.cdt.core.tests.FailingTest; +import junit.framework.AssertionFailedError; +import junit.framework.Test; +import junit.framework.TestSuite; public class RenameRegressionTests extends RenameTestBase { public RenameRegressionTests() { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameTemplatesTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameTemplatesTests.java index af8deda1cea..b9de816dd6f 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameTemplatesTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameTemplatesTests.java @@ -15,13 +15,13 @@ package org.eclipse.cdt.ui.tests.refactoring.rename; import java.io.StringWriter; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.core.resources.IFile; import org.eclipse.ltk.core.refactoring.Change; import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import junit.framework.Test; +import junit.framework.TestSuite; + /** * @author markus.schorn@windriver.com */ diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameTestBase.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameTestBase.java index d7cdf313852..16f396d7cfd 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameTestBase.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameTestBase.java @@ -14,6 +14,11 @@ ******************************************************************************/ package org.eclipse.cdt.ui.tests.refactoring.rename; +import org.eclipse.cdt.internal.ui.refactoring.rename.CRefactoringArgument; +import org.eclipse.cdt.internal.ui.refactoring.rename.CRefactory; +import org.eclipse.cdt.internal.ui.refactoring.rename.CRenameProcessor; +import org.eclipse.cdt.internal.ui.refactoring.rename.CRenameRefactoring; +import org.eclipse.cdt.internal.ui.refactoring.rename.TextSearchWrapper; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; @@ -22,12 +27,6 @@ import org.eclipse.ltk.core.refactoring.Change; import org.eclipse.ltk.core.refactoring.RefactoringStatus; import org.eclipse.ltk.core.refactoring.RefactoringStatusEntry; -import org.eclipse.cdt.internal.ui.refactoring.rename.CRefactoringArgument; -import org.eclipse.cdt.internal.ui.refactoring.rename.CRefactory; -import org.eclipse.cdt.internal.ui.refactoring.rename.CRenameProcessor; -import org.eclipse.cdt.internal.ui.refactoring.rename.CRenameRefactoring; -import org.eclipse.cdt.internal.ui.refactoring.rename.TextSearchWrapper; - /** * @author markus.schorn@windriver.com */ diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameTypeTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameTypeTests.java index 4335377de02..ac8c0a61b44 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameTypeTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameTypeTests.java @@ -16,13 +16,13 @@ package org.eclipse.cdt.ui.tests.refactoring.rename; import java.io.StringWriter; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.core.resources.IFile; import org.eclipse.ltk.core.refactoring.Change; import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import junit.framework.Test; +import junit.framework.TestSuite; + /** * @author markus.schorn@windriver.com */ diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameVariableTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameVariableTests.java index 54c663c1fa5..abc294c4ab3 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameVariableTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameVariableTests.java @@ -15,13 +15,13 @@ package org.eclipse.cdt.ui.tests.refactoring.rename; import java.io.StringWriter; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.core.resources.IFile; import org.eclipse.ltk.core.refactoring.Change; import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import junit.framework.Test; +import junit.framework.TestSuite; + /** * @author markus.schorn@windriver.com */ diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/togglefunction/ToggleNodeHelperTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/togglefunction/ToggleNodeHelperTest.java index 34707b4afc7..e51ff001fe5 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/togglefunction/ToggleNodeHelperTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/togglefunction/ToggleNodeHelperTest.java @@ -14,11 +14,10 @@ ******************************************************************************/ package org.eclipse.cdt.ui.tests.refactoring.togglefunction; -import junit.framework.TestCase; - +import org.eclipse.cdt.internal.ui.refactoring.togglefunction.ToggleNodeHelper; import org.junit.Test; -import org.eclipse.cdt.internal.ui.refactoring.togglefunction.ToggleNodeHelper; +import junit.framework.TestCase; /** * @author egraf diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/togglefunction/ToggleRefactoringCTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/togglefunction/ToggleRefactoringCTest.java index 793db164985..dd0d0c52aa7 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/togglefunction/ToggleRefactoringCTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/togglefunction/ToggleRefactoringCTest.java @@ -16,10 +16,9 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.refactoring.togglefunction; -import org.eclipse.cdt.ui.tests.refactoring.RefactoringTestBase; - import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; import org.eclipse.cdt.internal.ui.refactoring.togglefunction.ToggleRefactoring; +import org.eclipse.cdt.ui.tests.refactoring.RefactoringTestBase; /** * Tests for ToggleRefactoring for C projects. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/togglefunction/ToggleRefactoringTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/togglefunction/ToggleRefactoringTest.java index e740c9c6031..e2cfbd2bcd4 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/togglefunction/ToggleRefactoringTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/togglefunction/ToggleRefactoringTest.java @@ -17,13 +17,12 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.refactoring.togglefunction; -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.eclipse.cdt.ui.tests.refactoring.RefactoringTestBase; - import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; import org.eclipse.cdt.internal.ui.refactoring.togglefunction.ToggleRefactoring; +import org.eclipse.cdt.ui.tests.refactoring.RefactoringTestBase; + +import junit.framework.Test; +import junit.framework.TestSuite; /** * Tests for ToggleRefactoring for C++ projects. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/CorrectCaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/CorrectCaseTest.java index b2ae370396d..a0da59f0730 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/CorrectCaseTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/CorrectCaseTest.java @@ -14,11 +14,11 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.refactoring.utils; -import junit.framework.TestCase; - import org.eclipse.cdt.internal.ui.refactoring.utils.IdentifierHelper; import org.eclipse.cdt.internal.ui.refactoring.utils.IdentifierResult; +import junit.framework.TestCase; + /** * @author Thomas Corbat * diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/DefinitionFinderTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/DefinitionFinderTest.java index dbe31320e53..603986d5775 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/DefinitionFinderTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/DefinitionFinderTest.java @@ -14,26 +14,24 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.refactoring.utils; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; -import org.eclipse.ltk.core.refactoring.RefactoringStatus; -import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; - import org.eclipse.cdt.core.dom.ast.IASTDeclaration; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.tests.refactoring.RefactoringTestBase; - import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContext; import org.eclipse.cdt.internal.ui.refactoring.ModificationCollector; import org.eclipse.cdt.internal.ui.refactoring.utils.DefinitionFinder; +import org.eclipse.cdt.ui.tests.refactoring.RefactoringTestBase; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; +import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; public class DefinitionFinderTest extends RefactoringTestBase { private static class DummyRefactoring extends CRefactoring { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/DigitFirstCaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/DigitFirstCaseTest.java index d25c86cb195..76a02587091 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/DigitFirstCaseTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/DigitFirstCaseTest.java @@ -14,11 +14,11 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.refactoring.utils; -import junit.framework.TestCase; - import org.eclipse.cdt.internal.ui.refactoring.utils.IdentifierHelper; import org.eclipse.cdt.internal.ui.refactoring.utils.IdentifierResult; +import junit.framework.TestCase; + /** * @author Thomas Corbat * diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/EmptyCaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/EmptyCaseTest.java index 2644f23f6de..438034ece1e 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/EmptyCaseTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/EmptyCaseTest.java @@ -14,11 +14,11 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.refactoring.utils; -import junit.framework.TestCase; - import org.eclipse.cdt.internal.ui.refactoring.utils.IdentifierHelper; import org.eclipse.cdt.internal.ui.refactoring.utils.IdentifierResult; +import junit.framework.TestCase; + /** * @author Thomas Corbat * diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/IllegalCharCaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/IllegalCharCaseTest.java index e8c8d104e47..149df185185 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/IllegalCharCaseTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/IllegalCharCaseTest.java @@ -14,11 +14,11 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.refactoring.utils; -import junit.framework.TestCase; - import org.eclipse.cdt.internal.ui.refactoring.utils.IdentifierHelper; import org.eclipse.cdt.internal.ui.refactoring.utils.IdentifierResult; +import junit.framework.TestCase; + /** * @author Thomas Corbat * diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/KeywordCaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/KeywordCaseTest.java index 6e4759beabe..eb8ae854b4e 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/KeywordCaseTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/KeywordCaseTest.java @@ -14,11 +14,11 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.refactoring.utils; -import junit.framework.TestCase; - import org.eclipse.cdt.internal.ui.refactoring.utils.IdentifierHelper; import org.eclipse.cdt.internal.ui.refactoring.utils.IdentifierResult; +import junit.framework.TestCase; + /** * @author Thomas Corbat */ diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/NameComposerTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/NameComposerTest.java index 198c39f460a..4b1d8fdd93f 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/NameComposerTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/NameComposerTest.java @@ -15,11 +15,11 @@ package org.eclipse.cdt.ui.tests.refactoring.utils; import static org.eclipse.cdt.internal.corext.codemanipulation.StubUtility.trimFieldName; import static org.eclipse.cdt.internal.ui.util.NameComposer.createByExample; -import junit.framework.TestCase; +import org.eclipse.cdt.internal.ui.util.NameComposer; import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.internal.ui.util.NameComposer; +import junit.framework.TestCase; public class NameComposerTest extends TestCase { private static final int CAPITALIZATION_ORIGINAL = PreferenceConstants.NAME_STYLE_CAPITALIZATION_ORIGINAL; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/PseudoNameGeneratorTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/PseudoNameGeneratorTest.java index d119cf03253..a46b4198cd4 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/PseudoNameGeneratorTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/PseudoNameGeneratorTest.java @@ -14,10 +14,10 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.refactoring.utils; -import junit.framework.TestCase; - import org.eclipse.cdt.internal.ui.refactoring.utils.PseudoNameGenerator; +import junit.framework.TestCase; + /** * @author Mirko Stocker */ diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/BasicSearchTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/BasicSearchTest.java index a6ccf1d1f0c..e5996911f2c 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/BasicSearchTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/BasicSearchTest.java @@ -21,8 +21,17 @@ import java.io.File; import java.io.FileWriter; import java.lang.reflect.InvocationTargetException; -import junit.framework.TestSuite; - +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.IPDOMManager; +import org.eclipse.cdt.core.index.IIndexManager; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.core.testplugin.TestScannerProvider; +import org.eclipse.cdt.core.testplugin.util.TestSourceReader; +import org.eclipse.cdt.internal.ui.search.CSearchPatternQuery; +import org.eclipse.cdt.internal.ui.search.CSearchQuery; +import org.eclipse.cdt.internal.ui.search.CSearchResult; +import org.eclipse.cdt.internal.ui.search.CSearchViewPage; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IStatus; @@ -39,18 +48,7 @@ import org.eclipse.search.ui.ISearchResultPage; import org.eclipse.search.ui.ISearchResultViewPart; import org.eclipse.search.ui.NewSearchUI; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.IPDOMManager; -import org.eclipse.cdt.core.index.IIndexManager; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.core.testplugin.TestScannerProvider; -import org.eclipse.cdt.core.testplugin.util.TestSourceReader; - -import org.eclipse.cdt.internal.ui.search.CSearchPatternQuery; -import org.eclipse.cdt.internal.ui.search.CSearchQuery; -import org.eclipse.cdt.internal.ui.search.CSearchResult; -import org.eclipse.cdt.internal.ui.search.CSearchViewPage; +import junit.framework.TestSuite; public class BasicSearchTest extends SearchTestBase { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/FindReferencesTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/FindReferencesTest.java index d3220448ef4..fac9563d9ee 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/FindReferencesTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/FindReferencesTest.java @@ -14,23 +14,21 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.search; -import org.eclipse.core.resources.IFile; -import org.eclipse.jface.text.TextSelection; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.part.FileEditorInput; - import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.testplugin.EditorTestHelper; - import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.cdt.internal.ui.search.CSearchQuery; import org.eclipse.cdt.internal.ui.search.CSearchResult; import org.eclipse.cdt.internal.ui.search.CSearchTextSelectionQuery; import org.eclipse.cdt.internal.ui.search.LineSearchElement; import org.eclipse.cdt.internal.ui.search.LineSearchElement.Match; +import org.eclipse.cdt.ui.testplugin.EditorTestHelper; +import org.eclipse.core.resources.IFile; +import org.eclipse.jface.text.TextSelection; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.part.FileEditorInput; import junit.framework.TestSuite; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/LinkedNamesFinderTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/LinkedNamesFinderTest.java index c1a484d6225..8b4f60e530d 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/LinkedNamesFinderTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/LinkedNamesFinderTest.java @@ -17,19 +17,16 @@ import java.io.IOException; import java.util.Arrays; import java.util.Comparator; -import junit.framework.AssertionFailedError; -import junit.framework.TestSuite; - -import org.eclipse.jface.text.IRegion; - import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.parser.tests.ast2.AST2TestBase; import org.eclipse.cdt.core.testplugin.util.TestSourceReader; -import org.eclipse.cdt.ui.testplugin.CTestPlugin; - import org.eclipse.cdt.internal.core.parser.ParserException; - import org.eclipse.cdt.internal.ui.search.LinkedNamesFinder; +import org.eclipse.cdt.ui.testplugin.CTestPlugin; +import org.eclipse.jface.text.IRegion; + +import junit.framework.AssertionFailedError; +import junit.framework.TestSuite; /** * Tests for LinkedNamesFinder class. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/SearchReferencesAcrossLanguagesTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/SearchReferencesAcrossLanguagesTest.java index 569ae1b456c..610e011d395 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/SearchReferencesAcrossLanguagesTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/SearchReferencesAcrossLanguagesTest.java @@ -13,6 +13,18 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.search; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.IPDOMManager; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.index.IIndexManager; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.search.CSearchResult; +import org.eclipse.cdt.internal.ui.search.CSearchTextSelectionQuery; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.tests.BaseUITestCase; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IStatus; @@ -25,20 +37,6 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.ide.IDE; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.IPDOMManager; -import org.eclipse.cdt.core.index.IIndex; -import org.eclipse.cdt.core.index.IIndexManager; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.tests.BaseUITestCase; - -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.search.CSearchResult; -import org.eclipse.cdt.internal.ui.search.CSearchTextSelectionQuery; - import junit.framework.TestSuite; public class SearchReferencesAcrossLanguagesTest extends BaseUITestCase { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/SearchTestBase.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/SearchTestBase.java index 4276f4af9c6..356274bc60e 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/SearchTestBase.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/SearchTestBase.java @@ -10,14 +10,6 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.search; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IProjectDescription; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.osgi.framework.Bundle; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.ICElement; @@ -25,11 +17,17 @@ import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.TestScannerProvider; import org.eclipse.cdt.core.testplugin.util.TestSourceReader; -import org.eclipse.cdt.ui.testplugin.CTestPlugin; -import org.eclipse.cdt.ui.tests.BaseUITestCase; - import org.eclipse.cdt.internal.ui.search.CSearchQuery; import org.eclipse.cdt.internal.ui.search.CSearchResult; +import org.eclipse.cdt.ui.testplugin.CTestPlugin; +import org.eclipse.cdt.ui.tests.BaseUITestCase; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IProjectDescription; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.osgi.framework.Bundle; /** * Base class for tests that test functionality based on CSearchQuery. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AbstractAutoEditTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AbstractAutoEditTest.java index fe6437276f9..8068418c1c4 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AbstractAutoEditTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AbstractAutoEditTest.java @@ -20,6 +20,9 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; +import org.eclipse.cdt.core.testplugin.util.BaseTestCase; +import org.eclipse.cdt.core.testplugin.util.TestSourceReader; +import org.eclipse.cdt.ui.testplugin.CTestPlugin; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.DocumentCommand; import org.eclipse.jface.text.IAutoEditStrategy; @@ -27,10 +30,6 @@ import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.TextUtilities; -import org.eclipse.cdt.core.testplugin.util.BaseTestCase; -import org.eclipse.cdt.core.testplugin.util.TestSourceReader; -import org.eclipse.cdt.ui.testplugin.CTestPlugin; - /** * IAutoEditStrategy related tests */ diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AddBlockCommentTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AddBlockCommentTest.java index 5e843b51fad..32907dde893 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AddBlockCommentTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AddBlockCommentTest.java @@ -14,23 +14,20 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.text; -import junit.framework.TestSuite; - -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.internal.core.model.ext.SourceRange; +import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.cdt.ui.testplugin.EditorTestHelper; import org.eclipse.cdt.ui.testplugin.ResourceTestHelper; import org.eclipse.cdt.ui.tests.BaseUITestCase; +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; -import org.eclipse.cdt.internal.core.model.ext.SourceRange; - -import org.eclipse.cdt.internal.ui.editor.CEditor; +import junit.framework.TestSuite; /** * Tests for the AddBlockCommentAction. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AddIncludeTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AddIncludeTest.java index 2f164f93207..b393b7ea3ea 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AddIncludeTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AddIncludeTest.java @@ -17,27 +17,25 @@ package org.eclipse.cdt.ui.tests.text; import java.util.Collection; import java.util.ListResourceBundle; -import junit.extensions.TestSetup; -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.source.SourceViewer; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.IWorkingCopy; import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.util.BaseTestCase; +import org.eclipse.cdt.internal.ui.editor.AddIncludeAction; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.refactoring.includes.IElementSelector; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.testplugin.EditorTestHelper; import org.eclipse.cdt.ui.testplugin.ResourceTestHelper; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.source.SourceViewer; -import org.eclipse.cdt.internal.ui.editor.AddIncludeAction; -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.refactoring.includes.IElementSelector; +import junit.extensions.TestSetup; +import junit.framework.Test; +import junit.framework.TestSuite; /** * Tests the AddIncludeOnSelectionAction. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AlignConstActionTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AlignConstActionTest.java index fd2c029f311..c4930dffc5b 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AlignConstActionTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AlignConstActionTest.java @@ -13,20 +13,18 @@ package org.eclipse.cdt.ui.tests.text; import java.util.ListResourceBundle; -import org.eclipse.core.runtime.preferences.DefaultScope; -import org.eclipse.core.runtime.preferences.IEclipsePreferences; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.source.SourceViewer; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CCorePreferenceConstants; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.ui.testplugin.EditorTestHelper; -import org.eclipse.cdt.ui.testplugin.ResourceTestHelper; - import org.eclipse.cdt.internal.ui.actions.AlignConstAction; import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.ui.testplugin.EditorTestHelper; +import org.eclipse.cdt.ui.testplugin.ResourceTestHelper; +import org.eclipse.core.runtime.preferences.DefaultScope; +import org.eclipse.core.runtime.preferences.IEclipsePreferences; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.source.SourceViewer; import junit.extensions.TestSetup; import junit.framework.Test; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AsmPartitionerTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AsmPartitionerTest.java index b6ea7a29926..598d4b0a01e 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AsmPartitionerTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AsmPartitionerTest.java @@ -14,10 +14,8 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.text; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - +import org.eclipse.cdt.internal.ui.text.asm.AsmPartitionScanner; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.IDocument; @@ -27,9 +25,9 @@ import org.eclipse.jface.text.ITypedRegion; import org.eclipse.jface.text.TypedRegion; import org.eclipse.jface.text.rules.FastPartitioner; -import org.eclipse.cdt.ui.text.ICPartitions; - -import org.eclipse.cdt.internal.ui.text.asm.AsmPartitionScanner; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; /** * Tests to verify the Asm partitioning. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AsmTextEditorTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AsmTextEditorTest.java index 2102f15bb3c..ef592926c45 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AsmTextEditorTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AsmTextEditorTest.java @@ -14,17 +14,15 @@ package org.eclipse.cdt.ui.tests.text; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.preferences.DefaultScope; -import org.eclipse.core.runtime.preferences.IEclipsePreferences; - import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.internal.ui.editor.asm.AsmTextEditor; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.cdt.ui.testplugin.EditorTestHelper; - -import org.eclipse.cdt.internal.ui.editor.asm.AsmTextEditor; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.preferences.DefaultScope; +import org.eclipse.core.runtime.preferences.IEclipsePreferences; import junit.framework.TestCase; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/BasicCEditorTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/BasicCEditorTest.java index 3fd89a64104..16201e37244 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/BasicCEditorTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/BasicCEditorTest.java @@ -20,9 +20,26 @@ import java.lang.ref.WeakReference; import java.net.URI; import java.net.URISyntaxException; -import junit.framework.Test; -import junit.framework.TestSuite; - +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.core.testplugin.ResourceHelper; +import org.eclipse.cdt.internal.core.model.ExternalTranslationUnit; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.editor.CEditorMessages; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.testplugin.Accessor; +import org.eclipse.cdt.ui.testplugin.DisplayHelper; +import org.eclipse.cdt.ui.testplugin.EditorTestHelper; +import org.eclipse.cdt.ui.testplugin.FileTool; +import org.eclipse.cdt.ui.testplugin.ResourceTestHelper; +import org.eclipse.cdt.ui.tests.BaseUITestCase; +import org.eclipse.cdt.ui.text.ICColorConstants; +import org.eclipse.cdt.ui.text.IColorManager; import org.eclipse.core.filesystem.EFS; import org.eclipse.core.filesystem.IFileStore; import org.eclipse.core.filesystem.URIUtil; @@ -53,28 +70,8 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.ide.IDE; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.core.testplugin.ResourceHelper; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.testplugin.Accessor; -import org.eclipse.cdt.ui.testplugin.DisplayHelper; -import org.eclipse.cdt.ui.testplugin.EditorTestHelper; -import org.eclipse.cdt.ui.testplugin.FileTool; -import org.eclipse.cdt.ui.testplugin.ResourceTestHelper; -import org.eclipse.cdt.ui.tests.BaseUITestCase; -import org.eclipse.cdt.ui.text.ICColorConstants; -import org.eclipse.cdt.ui.text.IColorManager; - -import org.eclipse.cdt.internal.core.model.ExternalTranslationUnit; - -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.editor.CEditorMessages; -import org.eclipse.cdt.internal.ui.util.EditorUtility; +import junit.framework.Test; +import junit.framework.TestSuite; /** * Basic CEditor tests. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/BracketInserterTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/BracketInserterTest.java index 43f71bbc862..216eb13befd 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/BracketInserterTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/BracketInserterTest.java @@ -15,10 +15,17 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.text; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - +import org.eclipse.cdt.core.dom.IPDOMManager; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICContainer; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.testplugin.Accessor; +import org.eclipse.cdt.ui.testplugin.DisplayHelper; +import org.eclipse.cdt.ui.testplugin.EditorTestHelper; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; @@ -38,18 +45,9 @@ import org.eclipse.swt.custom.StyledText; import org.eclipse.swt.widgets.Event; import org.eclipse.ui.PartInitException; -import org.eclipse.cdt.core.dom.IPDOMManager; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ICContainer; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.testplugin.Accessor; -import org.eclipse.cdt.ui.testplugin.DisplayHelper; -import org.eclipse.cdt.ui.testplugin.EditorTestHelper; - -import org.eclipse.cdt.internal.ui.editor.CEditor; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; /** * Tests the automatic bracket insertion feature of the CEditor. Also tests diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CAutoIndentTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CAutoIndentTest.java index c09e2c660b3..c0356e8cbe2 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CAutoIndentTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CAutoIndentTest.java @@ -22,9 +22,15 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; -import junit.framework.Test; -import junit.framework.TestSuite; - +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; +import org.eclipse.cdt.core.formatter.DefaultCodeFormatterOptions; +import org.eclipse.cdt.internal.ui.text.CAutoIndentStrategy; +import org.eclipse.cdt.internal.ui.text.CTextTools; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.ICPartitions; +import org.eclipse.cdt.ui.text.doctools.DefaultMultilineCommentAutoEditStrategy; import org.eclipse.core.runtime.ILogListener; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Plugin; @@ -35,16 +41,8 @@ import org.eclipse.jface.text.Document; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.TabsToSpacesConverter; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; -import org.eclipse.cdt.core.formatter.DefaultCodeFormatterOptions; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.ICPartitions; -import org.eclipse.cdt.ui.text.doctools.DefaultMultilineCommentAutoEditStrategy; - -import org.eclipse.cdt.internal.ui.text.CAutoIndentStrategy; -import org.eclipse.cdt.internal.ui.text.CTextTools; +import junit.framework.Test; +import junit.framework.TestSuite; /** * Testing the auto indent strategies. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CBreakIteratorTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CBreakIteratorTest.java index 50f257c4a96..3da31c8dfee 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CBreakIteratorTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CBreakIteratorTest.java @@ -14,11 +14,11 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.text; +import org.eclipse.cdt.internal.ui.text.CBreakIterator; + import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.cdt.internal.ui.text.CBreakIterator; - public class CBreakIteratorTest extends BreakIteratorTest { public static Test suite() { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CHeaderRuleTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CHeaderRuleTest.java index 22d49e9991b..ea0bd407937 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CHeaderRuleTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CHeaderRuleTest.java @@ -15,17 +15,16 @@ package org.eclipse.cdt.ui.tests.text; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - +import org.eclipse.cdt.internal.ui.text.CHeaderRule; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.rules.IRule; import org.eclipse.jface.text.rules.IToken; import org.eclipse.jface.text.rules.RuleBasedScanner; import org.eclipse.jface.text.rules.Token; -import org.eclipse.cdt.internal.ui.text.CHeaderRule; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; /** * Tests to verify recognition of #include headers. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CHeuristicScannerTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CHeuristicScannerTest.java index 3bc25c0eecb..b938ae4d856 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CHeuristicScannerTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CHeuristicScannerTest.java @@ -16,22 +16,20 @@ package org.eclipse.cdt.ui.tests.text; import java.util.HashMap; -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.eclipse.jface.text.Document; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.rules.FastPartitioner; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; -import org.eclipse.cdt.ui.text.ICPartitions; - import org.eclipse.cdt.internal.ui.text.CHeuristicScanner; import org.eclipse.cdt.internal.ui.text.CIndenter; import org.eclipse.cdt.internal.ui.text.FastCPartitionScanner; +import org.eclipse.cdt.ui.text.ICPartitions; +import org.eclipse.jface.text.Document; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.rules.FastPartitioner; + +import junit.framework.Assert; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; /** * CHeuristicScannerTest. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CIndenterTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CIndenterTest.java index 3c060453309..c0e3178f300 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CIndenterTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CIndenterTest.java @@ -17,19 +17,17 @@ package org.eclipse.cdt.ui.tests.text; import java.util.HashMap; import java.util.Map; -import junit.framework.TestSuite; - -import org.eclipse.jface.text.Document; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.source.LineRange; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; import org.eclipse.cdt.core.formatter.DefaultCodeFormatterOptions; -import org.eclipse.cdt.ui.tests.BaseUITestCase; - import org.eclipse.cdt.internal.ui.editor.CDocumentSetupParticipant; import org.eclipse.cdt.internal.ui.editor.IndentUtil; +import org.eclipse.cdt.ui.tests.BaseUITestCase; +import org.eclipse.jface.text.Document; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.source.LineRange; + +import junit.framework.TestSuite; /** * Tests for the CIndenter. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CPartitionScanner.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CPartitionScanner.java index 1e889943620..1aab6b1b4b4 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CPartitionScanner.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CPartitionScanner.java @@ -17,6 +17,7 @@ package org.eclipse.cdt.ui.tests.text; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.jface.text.rules.EndOfLineRule; import org.eclipse.jface.text.rules.ICharacterScanner; import org.eclipse.jface.text.rules.IPredicateRule; @@ -28,8 +29,6 @@ import org.eclipse.jface.text.rules.SingleLineRule; import org.eclipse.jface.text.rules.Token; import org.eclipse.jface.text.rules.WordRule; -import org.eclipse.cdt.ui.text.ICPartitions; - /** * This scanner is not actually use in the code it was relace by * FastCPartitionScanner which was faster. We keep this around diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CPartitionerTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CPartitionerTest.java index 3123ae865ff..c62cad5f33b 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CPartitionerTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CPartitionerTest.java @@ -15,10 +15,8 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.text; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - +import org.eclipse.cdt.internal.ui.text.CTextTools; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.IDocument; @@ -27,9 +25,9 @@ import org.eclipse.jface.text.IDocumentPartitioningListener; import org.eclipse.jface.text.ITypedRegion; import org.eclipse.jface.text.TypedRegion; -import org.eclipse.cdt.ui.text.ICPartitions; - -import org.eclipse.cdt.internal.ui.text.CTextTools; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; /** * Tests to verify the C partitioning. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CStructureCreatorTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CStructureCreatorTest.java index 289d3b4c21a..638cb14604f 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CStructureCreatorTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CStructureCreatorTest.java @@ -14,17 +14,6 @@ package org.eclipse.cdt.ui.tests.text; -import junit.framework.TestSuite; - -import org.eclipse.compare.ITypedElement; -import org.eclipse.compare.ResourceNode; -import org.eclipse.compare.structuremergeviewer.DocumentRangeNode; -import org.eclipse.compare.structuremergeviewer.IStructureComparator; -import org.eclipse.core.resources.IFile; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.Position; - import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICElement; @@ -33,11 +22,20 @@ import org.eclipse.cdt.core.model.IParent; import org.eclipse.cdt.core.model.ISourceRange; import org.eclipse.cdt.core.model.ISourceReference; import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.internal.ui.compare.CStructureCreator; import org.eclipse.cdt.ui.testplugin.EditorTestHelper; import org.eclipse.cdt.ui.testplugin.ResourceTestHelper; import org.eclipse.cdt.ui.tests.BaseUITestCase; +import org.eclipse.compare.ITypedElement; +import org.eclipse.compare.ResourceNode; +import org.eclipse.compare.structuremergeviewer.DocumentRangeNode; +import org.eclipse.compare.structuremergeviewer.IStructureComparator; +import org.eclipse.core.resources.IFile; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.Position; -import org.eclipse.cdt.internal.ui.compare.CStructureCreator; +import junit.framework.TestSuite; /** * Tests for the CStructureCreator. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CWordFinderTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CWordFinderTest.java index cb09af6365b..62b0bc05c2d 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CWordFinderTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CWordFinderTest.java @@ -15,16 +15,14 @@ package org.eclipse.cdt.ui.tests.text; -import junit.framework.TestSuite; - +import org.eclipse.cdt.internal.ui.text.CWordFinder; +import org.eclipse.cdt.ui.tests.BaseUITestCase; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; -import org.eclipse.cdt.ui.tests.BaseUITestCase; - -import org.eclipse.cdt.internal.ui.text.CWordFinder; +import junit.framework.TestSuite; /** * Tests for CWordFinder. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CWordIteratorTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CWordIteratorTest.java index 5d0d3e693a7..78f7eb8c537 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CWordIteratorTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CWordIteratorTest.java @@ -14,11 +14,11 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.text; +import org.eclipse.cdt.internal.ui.text.CWordIterator; + import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.cdt.internal.ui.text.CWordIterator; - public class CWordIteratorTest extends BreakIteratorTest { public static Test suite() { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CodeFormatterTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CodeFormatterTest.java index 9911c3a7fc2..ad6014f0ba8 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CodeFormatterTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CodeFormatterTest.java @@ -18,21 +18,19 @@ package org.eclipse.cdt.ui.tests.text; import java.util.HashMap; import java.util.Map; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.Document; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.TextUtilities; -import org.eclipse.text.edits.TextEdit; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.ast.gnu.c.GCCLanguage; import org.eclipse.cdt.core.formatter.CodeFormatter; import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; import org.eclipse.cdt.core.formatter.DefaultCodeFormatterOptions; -import org.eclipse.cdt.ui.tests.BaseUITestCase; - import org.eclipse.cdt.internal.corext.util.CodeFormatterUtil; import org.eclipse.cdt.internal.formatter.align.Alignment; +import org.eclipse.cdt.ui.tests.BaseUITestCase; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.Document; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.TextUtilities; +import org.eclipse.text.edits.TextEdit; import junit.framework.TestSuite; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/DefaultCCommentAutoEditStrategyTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/DefaultCCommentAutoEditStrategyTest.java index 2b668703707..00d57b8daf4 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/DefaultCCommentAutoEditStrategyTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/DefaultCCommentAutoEditStrategyTest.java @@ -17,26 +17,24 @@ package org.eclipse.cdt.ui.tests.text; import java.util.HashMap; -import junit.framework.Test; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.Document; -import org.eclipse.jface.text.IDocument; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.ast.IASTDeclaration; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.util.TestSourceReader; +import org.eclipse.cdt.internal.ui.text.CAutoIndentStrategy; +import org.eclipse.cdt.internal.ui.text.CTextTools; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.cdt.ui.text.doctools.DefaultMultilineCommentAutoEditStrategy; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.Document; +import org.eclipse.jface.text.IDocument; -import org.eclipse.cdt.internal.ui.text.CAutoIndentStrategy; -import org.eclipse.cdt.internal.ui.text.CTextTools; +import junit.framework.Test; /** * Testing the auto indent strategies. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/FoldingCommentsTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/FoldingCommentsTest.java index b4b4ebe5b08..ae836835d50 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/FoldingCommentsTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/FoldingCommentsTest.java @@ -16,6 +16,8 @@ package org.eclipse.cdt.ui.tests.text; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.jface.preference.IPreferenceStore; import org.junit.After; import org.junit.Before; @@ -27,9 +29,6 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; - /** * Test doxygen style comment folding. This parametrized test checks all the * combinations of doxygen enabled or not along with initially folding these diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/FoldingTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/FoldingTest.java index 114137b9e94..493ec75d848 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/FoldingTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/FoldingTest.java @@ -19,18 +19,16 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; +import org.eclipse.cdt.internal.ui.text.doctools.DocCommentOwnerManager; +import org.eclipse.cdt.internal.ui.text.doctools.NullDocCommentOwner; +import org.eclipse.cdt.internal.ui.text.folding.DefaultCFoldingStructureProvider.CProjectionAnnotation; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.source.Annotation; import org.eclipse.jface.text.source.projection.ProjectionAnnotationModel; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; - -import org.eclipse.cdt.internal.ui.text.doctools.DocCommentOwnerManager; -import org.eclipse.cdt.internal.ui.text.doctools.NullDocCommentOwner; -import org.eclipse.cdt.internal.ui.text.folding.DefaultCFoldingStructureProvider.CProjectionAnnotation; - import junit.framework.Test; import junit.framework.TestSuite; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/FoldingTestBase.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/FoldingTestBase.java index a8b738f27b7..ebe8123d7d0 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/FoldingTestBase.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/FoldingTestBase.java @@ -20,6 +20,16 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.core.testplugin.util.TestSourceReader; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.text.doctools.DocCommentOwnerManager; +import org.eclipse.cdt.internal.ui.text.doctools.NullDocCommentOwner; +import org.eclipse.cdt.ui.testplugin.EditorTestHelper; +import org.eclipse.cdt.ui.testplugin.ResourceTestHelper; +import org.eclipse.cdt.ui.tests.BaseUITestCase; +import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.Path; import org.eclipse.jface.text.BadLocationException; @@ -33,18 +43,6 @@ import org.eclipse.jface.text.source.projection.ProjectionAnnotation; import org.eclipse.jface.text.source.projection.ProjectionAnnotationModel; import org.eclipse.ui.PartInitException; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.core.testplugin.util.TestSourceReader; -import org.eclipse.cdt.ui.testplugin.EditorTestHelper; -import org.eclipse.cdt.ui.testplugin.ResourceTestHelper; -import org.eclipse.cdt.ui.tests.BaseUITestCase; -import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; - -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.text.doctools.DocCommentOwnerManager; -import org.eclipse.cdt.internal.ui.text.doctools.NullDocCommentOwner; - abstract public class FoldingTestBase extends BaseUITestCase { protected static class ProjectionPosition extends Position implements IProjectionPosition, IRegion { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/FormatActionTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/FormatActionTest.java index 96fe6f52aa0..99b8b109a1e 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/FormatActionTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/FormatActionTest.java @@ -16,23 +16,21 @@ package org.eclipse.cdt.ui.tests.text; import java.util.ListResourceBundle; -import junit.extensions.TestSetup; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.source.SourceViewer; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.cdt.ui.testplugin.EditorTestHelper; import org.eclipse.cdt.ui.testplugin.ResourceTestHelper; +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.source.SourceViewer; -import org.eclipse.cdt.internal.ui.editor.CEditor; +import junit.extensions.TestSetup; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; /** * Test the Formatter. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/HyperlinkTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/HyperlinkTest.java index c687189e958..2481feea9ab 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/HyperlinkTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/HyperlinkTest.java @@ -14,17 +14,6 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.text; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.Region; -import org.eclipse.jface.text.hyperlink.IHyperlink; - import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.model.ICContainer; @@ -32,15 +21,23 @@ import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.model.IWorkingCopy; import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.IWorkingCopyManager; -import org.eclipse.cdt.ui.testplugin.EditorTestHelper; - import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; - import org.eclipse.cdt.internal.ui.editor.ASTProvider; import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.cdt.internal.ui.editor.CElementHyperlinkDetector; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.IWorkingCopyManager; +import org.eclipse.cdt.ui.testplugin.EditorTestHelper; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; +import org.eclipse.jface.text.hyperlink.IHyperlink; + +import junit.framework.TestCase; +import junit.framework.TestSuite; /** * This test just checks that hyperlinks are created in the right diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/InactiveCodeHighlightingTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/InactiveCodeHighlightingTest.java index 53d21d55600..4e0affcfa19 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/InactiveCodeHighlightingTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/InactiveCodeHighlightingTest.java @@ -16,25 +16,23 @@ package org.eclipse.cdt.ui.tests.text; import java.util.List; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.Position; -import org.eclipse.jface.text.source.SourceViewer; -import org.eclipse.ui.texteditor.AbstractDecoratedTextEditor; - import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.editor.CSourceViewerDecorationSupport; +import org.eclipse.cdt.internal.ui.editor.InactiveCodeHighlighting; import org.eclipse.cdt.ui.testplugin.Accessor; import org.eclipse.cdt.ui.testplugin.EditorTestHelper; import org.eclipse.cdt.ui.testplugin.ResourceTestHelper; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.Position; +import org.eclipse.jface.text.source.SourceViewer; +import org.eclipse.ui.texteditor.AbstractDecoratedTextEditor; -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.editor.CSourceViewerDecorationSupport; -import org.eclipse.cdt.internal.ui.editor.InactiveCodeHighlighting; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; /** * Tests for inactive code highlighting. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/IndentActionTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/IndentActionTest.java index fd0db1fb141..a0e224fefd6 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/IndentActionTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/IndentActionTest.java @@ -17,18 +17,16 @@ package org.eclipse.cdt.ui.tests.text; import java.util.ListResourceBundle; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.source.SourceViewer; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.ui.testplugin.EditorTestHelper; -import org.eclipse.cdt.ui.testplugin.ResourceTestHelper; - import org.eclipse.cdt.internal.ui.actions.IndentAction; import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.ui.testplugin.EditorTestHelper; +import org.eclipse.cdt.ui.testplugin.ResourceTestHelper; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.source.SourceViewer; import junit.extensions.TestSetup; import junit.framework.Test; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/MarkOccurrenceTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/MarkOccurrenceTest.java index c60c28b0823..aa4a5a9c594 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/MarkOccurrenceTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/MarkOccurrenceTest.java @@ -16,10 +16,18 @@ package org.eclipse.cdt.ui.tests.text; import java.util.Iterator; -import junit.extensions.TestSetup; -import junit.framework.Test; -import junit.framework.TestSuite; - +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.editor.SemanticHighlightings; +import org.eclipse.cdt.internal.ui.viewsupport.ISelectionListenerWithAST; +import org.eclipse.cdt.internal.ui.viewsupport.SelectionListenerWithASTManager; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.testplugin.DisplayHelper; +import org.eclipse.cdt.ui.testplugin.EditorTestHelper; +import org.eclipse.cdt.ui.tests.BaseUITestCase; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; @@ -46,19 +54,9 @@ import org.eclipse.ui.editors.text.EditorsUI; import org.eclipse.ui.internal.editors.text.EditorsPlugin; import org.eclipse.ui.texteditor.AnnotationPreference; -import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.testplugin.DisplayHelper; -import org.eclipse.cdt.ui.testplugin.EditorTestHelper; -import org.eclipse.cdt.ui.tests.BaseUITestCase; - -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.editor.SemanticHighlightings; -import org.eclipse.cdt.internal.ui.viewsupport.ISelectionListenerWithAST; -import org.eclipse.cdt.internal.ui.viewsupport.SelectionListenerWithASTManager; +import junit.extensions.TestSetup; +import junit.framework.Test; +import junit.framework.TestSuite; /** * Tests the C/C++ Editor's occurrence marking feature. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/NumberRuleTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/NumberRuleTest.java index 23769d63872..71b19f67fd2 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/NumberRuleTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/NumberRuleTest.java @@ -14,10 +14,6 @@ package org.eclipse.cdt.ui.tests.text; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.internal.ui.text.NumberRule; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.rules.IRule; @@ -25,6 +21,10 @@ import org.eclipse.jface.text.rules.IToken; import org.eclipse.jface.text.rules.RuleBasedScanner; import org.eclipse.jface.text.rules.Token; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * Testing the NumberRule matching integers and floats. */ diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/OverrideIndicatorTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/OverrideIndicatorTest.java index 578968a03f6..b23118ff15e 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/OverrideIndicatorTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/OverrideIndicatorTest.java @@ -14,12 +14,10 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.text; -import org.eclipse.jface.text.source.Annotation; - -import org.eclipse.cdt.ui.tests.AnnotationTestCase; - import org.eclipse.cdt.internal.ui.editor.OverrideIndicatorManager; import org.eclipse.cdt.internal.ui.editor.OverrideIndicatorManager.OverrideIndicator; +import org.eclipse.cdt.ui.tests.AnnotationTestCase; +import org.eclipse.jface.text.source.Annotation; /** * Test for {@see OverrideIndicatorManager} class. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/PairMatcherTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/PairMatcherTest.java index 60843672d84..7bee1c51dbc 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/PairMatcherTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/PairMatcherTest.java @@ -14,19 +14,17 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.text; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - +import org.eclipse.cdt.internal.ui.text.CPairMatcher; +import org.eclipse.cdt.internal.ui.text.FastCPartitionScanner; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.rules.FastPartitioner; -import org.eclipse.cdt.ui.text.ICPartitions; - -import org.eclipse.cdt.internal.ui.text.CPairMatcher; -import org.eclipse.cdt.internal.ui.text.FastCPartitionScanner; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; public class PairMatcherTest extends TestCase { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/PartitionTokenScannerTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/PartitionTokenScannerTest.java index 486325bc543..526d72730c0 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/PartitionTokenScannerTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/PartitionTokenScannerTest.java @@ -19,10 +19,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - +import org.eclipse.cdt.internal.ui.text.FastCPartitionScanner; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.IDocument; @@ -30,7 +27,9 @@ import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.rules.IPartitionTokenScanner; import org.eclipse.jface.text.rules.IToken; -import org.eclipse.cdt.internal.ui.text.FastCPartitionScanner; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; /** * Compares two <code>IParitionTokenScanner</code>s for performance. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/RemoveBlockCommentTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/RemoveBlockCommentTest.java index 9ad34ac43d1..cc2ba1a1fed 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/RemoveBlockCommentTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/RemoveBlockCommentTest.java @@ -14,23 +14,20 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.text; -import junit.framework.TestSuite; - -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.text.IDocument; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.internal.core.model.ext.SourceRange; +import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.cdt.ui.testplugin.EditorTestHelper; import org.eclipse.cdt.ui.testplugin.ResourceTestHelper; import org.eclipse.cdt.ui.tests.BaseUITestCase; import org.eclipse.cdt.ui.tests.text.AddBlockCommentTest.LinePosition; +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.text.IDocument; -import org.eclipse.cdt.internal.core.model.ext.SourceRange; - -import org.eclipse.cdt.internal.ui.editor.CEditor; +import junit.framework.TestSuite; /** * Tests for the RemoveBlockCommentAction. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/SemanticHighlightingTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/SemanticHighlightingTest.java index 0bb014c9784..a34bbb6ea4f 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/SemanticHighlightingTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/SemanticHighlightingTest.java @@ -24,17 +24,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.preference.PreferenceConverter; -import org.eclipse.jface.text.BadPositionCategoryException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.Position; -import org.eclipse.jface.text.source.SourceViewer; -import org.eclipse.swt.graphics.RGB; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.dom.ast.IASTComment; @@ -46,19 +35,28 @@ import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.TestScannerProvider; import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.cdt.core.testplugin.util.TestSourceReader; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.testplugin.Accessor; -import org.eclipse.cdt.ui.testplugin.CTestPlugin; -import org.eclipse.cdt.ui.testplugin.EditorTestHelper; -import org.eclipse.cdt.ui.testplugin.ResourceTestHelper; - import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.cdt.internal.ui.editor.SemanticHighlighting; import org.eclipse.cdt.internal.ui.editor.SemanticHighlightingManager; import org.eclipse.cdt.internal.ui.editor.SemanticHighlightingManager.HighlightedPosition; import org.eclipse.cdt.internal.ui.editor.SemanticHighlightingPresenter; import org.eclipse.cdt.internal.ui.editor.SemanticHighlightings; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.testplugin.Accessor; +import org.eclipse.cdt.ui.testplugin.CTestPlugin; +import org.eclipse.cdt.ui.testplugin.EditorTestHelper; +import org.eclipse.cdt.ui.testplugin.ResourceTestHelper; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.jface.preference.PreferenceConverter; +import org.eclipse.jface.text.BadPositionCategoryException; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.Position; +import org.eclipse.jface.text.source.SourceViewer; +import org.eclipse.swt.graphics.RGB; import junit.framework.Test; import junit.framework.TestCase; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/ShiftActionTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/ShiftActionTest.java index 07d3983c651..c0f885ab714 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/ShiftActionTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/ShiftActionTest.java @@ -15,10 +15,13 @@ package org.eclipse.cdt.ui.tests.text; import java.util.ListResourceBundle; -import junit.extensions.TestSetup; -import junit.framework.Test; -import junit.framework.TestSuite; - +import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.ui.testplugin.EditorTestHelper; +import org.eclipse.cdt.ui.testplugin.ResourceTestHelper; +import org.eclipse.cdt.ui.tests.BaseUITestCase; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.NullProgressMonitor; @@ -28,13 +31,9 @@ import org.eclipse.jface.text.ITextOperationTarget; import org.eclipse.jface.text.source.SourceViewer; import org.eclipse.ui.texteditor.ShiftAction; -import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.ui.testplugin.EditorTestHelper; -import org.eclipse.cdt.ui.testplugin.ResourceTestHelper; -import org.eclipse.cdt.ui.tests.BaseUITestCase; -import org.eclipse.cdt.internal.ui.editor.CEditor; +import junit.extensions.TestSetup; +import junit.framework.Test; +import junit.framework.TestSuite; /** * Test the Shift left/right actions. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/SortLinesTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/SortLinesTest.java index 4e3fde4f672..6b2c0cfb8fb 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/SortLinesTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/SortLinesTest.java @@ -15,10 +15,14 @@ package org.eclipse.cdt.ui.tests.text; import java.util.ListResourceBundle; -import junit.extensions.TestSetup; -import junit.framework.Test; -import junit.framework.TestSuite; - +import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.editor.SortLinesAction; +import org.eclipse.cdt.ui.testplugin.EditorTestHelper; +import org.eclipse.cdt.ui.testplugin.ResourceTestHelper; +import org.eclipse.cdt.ui.tests.BaseUITestCase; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.NullProgressMonitor; @@ -27,14 +31,9 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.source.SourceViewer; -import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.ui.testplugin.EditorTestHelper; -import org.eclipse.cdt.ui.testplugin.ResourceTestHelper; -import org.eclipse.cdt.ui.tests.BaseUITestCase; -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.editor.SortLinesAction; +import junit.extensions.TestSetup; +import junit.framework.Test; +import junit.framework.TestSuite; /** * Tests for the SortLinesAction. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/TemplateFormatterTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/TemplateFormatterTest.java index 61bd0e4a9b9..c26ff63cba7 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/TemplateFormatterTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/TemplateFormatterTest.java @@ -15,8 +15,10 @@ package org.eclipse.cdt.ui.tests.text; import java.util.HashMap; -import junit.framework.TestSuite; - +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; +import org.eclipse.cdt.internal.corext.template.c.CFormatter; +import org.eclipse.cdt.ui.tests.BaseUITestCase; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.templates.DocumentTemplateContext; import org.eclipse.jface.text.templates.GlobalTemplateVariables; @@ -25,11 +27,7 @@ import org.eclipse.jface.text.templates.TemplateBuffer; import org.eclipse.jface.text.templates.TemplateContext; import org.eclipse.jface.text.templates.TemplateContextType; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; -import org.eclipse.cdt.ui.tests.BaseUITestCase; - -import org.eclipse.cdt.internal.corext.template.c.CFormatter; +import junit.framework.TestSuite; /** * Tests for the template formatter (CFormatter). diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/TextTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/TextTestSuite.java index 541f3b64e3b..de37cda157a 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/TextTestSuite.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/TextTestSuite.java @@ -17,11 +17,10 @@ package org.eclipse.cdt.ui.tests.text; +import org.eclipse.cdt.ui.tests.text.doctools.DocCommentTestSuite; import org.junit.runner.RunWith; import org.junit.runners.Suite; -import org.eclipse.cdt.ui.tests.text.doctools.DocCommentTestSuite; - @RunWith(Suite.class) @Suite.SuiteClasses({ diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTests.java index 102f3712bcf..06e1bded2a4 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTests.java @@ -17,9 +17,19 @@ package org.eclipse.cdt.ui.tests.text.contentassist; import java.io.ByteArrayInputStream; import java.io.InputStream; -import junit.framework.Test; -import junit.framework.TestSuite; - +import org.eclipse.cdt.core.dom.IPDOMManager; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.internal.ui.CHelpProviderManager; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.text.CHelpBookDescriptor; +import org.eclipse.cdt.internal.ui.text.contentassist.CContentAssistProcessor; +import org.eclipse.cdt.ui.tests.BaseUITestCase; +import org.eclipse.cdt.ui.text.ICHelpInvocationContext; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -33,20 +43,8 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.FileEditorInput; -import org.eclipse.cdt.core.dom.IPDOMManager; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.ui.tests.BaseUITestCase; -import org.eclipse.cdt.ui.text.ICHelpInvocationContext; - -import org.eclipse.cdt.internal.ui.CHelpProviderManager; -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.text.CHelpBookDescriptor; -import org.eclipse.cdt.internal.ui.text.contentassist.CContentAssistProcessor; +import junit.framework.Test; +import junit.framework.TestSuite; /** * @author aniefer diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ProposalFilterPreferencesTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ProposalFilterPreferencesTest.java index c3b3bb80f0f..b8a7c2e942d 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ProposalFilterPreferencesTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ProposalFilterPreferencesTest.java @@ -13,15 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.text.contentassist; -import junit.framework.TestCase; - +import org.eclipse.cdt.internal.ui.preferences.ProposalFilterPreferencesUtil; +import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.preferences.ProposalFilterPreferencesUtil; -import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference; +import junit.framework.TestCase; /** * This test covers the convenience methods diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/AbstractContentAssistTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/AbstractContentAssistTest.java index 86525aca15a..cb051436426 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/AbstractContentAssistTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/AbstractContentAssistTest.java @@ -28,6 +28,24 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.eclipse.cdt.core.dom.IPDOMManager; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTNameBase; +import org.eclipse.cdt.internal.ui.text.contentassist.CCompletionProposal; +import org.eclipse.cdt.internal.ui.text.contentassist.CContentAssistProcessor; +import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistMessages; +import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference; +import org.eclipse.cdt.internal.ui.text.contentassist.ParameterGuessingProposal; +import org.eclipse.cdt.internal.ui.text.contentassist.RelevanceConstants; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.testplugin.CTestPlugin; +import org.eclipse.cdt.ui.testplugin.EditorTestHelper; +import org.eclipse.cdt.ui.tests.BaseUITestCase; +import org.eclipse.cdt.ui.text.ICCompletionProposal; +import org.eclipse.cdt.ui.text.ICPartitions; +import org.eclipse.cdt.ui.text.contentassist.ContentAssistInvocationContext; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.jface.preference.IPreferenceStore; @@ -41,27 +59,6 @@ import org.eclipse.jface.text.templates.TemplateProposal; import org.eclipse.ui.texteditor.AbstractTextEditor; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.core.dom.IPDOMManager; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.testplugin.CTestPlugin; -import org.eclipse.cdt.ui.testplugin.EditorTestHelper; -import org.eclipse.cdt.ui.tests.BaseUITestCase; -import org.eclipse.cdt.ui.text.ICCompletionProposal; -import org.eclipse.cdt.ui.text.ICPartitions; -import org.eclipse.cdt.ui.text.contentassist.ContentAssistInvocationContext; - -import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTNameBase; - -import org.eclipse.cdt.internal.ui.text.contentassist.CCompletionProposal; -import org.eclipse.cdt.internal.ui.text.contentassist.CContentAssistProcessor; -import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistMessages; -import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference; -import org.eclipse.cdt.internal.ui.text.contentassist.ParameterGuessingProposal; -import org.eclipse.cdt.internal.ui.text.contentassist.RelevanceConstants; - public abstract class AbstractContentAssistTest extends BaseUITestCase { public static enum CompareType { ID, DISPLAY, REPLACEMENT, CONTEXT, INFORMATION diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CPPParameterGuessingTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CPPParameterGuessingTests.java index 2ca595f6fc7..8626030a388 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CPPParameterGuessingTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CPPParameterGuessingTests.java @@ -16,12 +16,11 @@ package org.eclipse.cdt.ui.tests.text.contentassist2; import java.util.HashMap; import java.util.Map; -import junit.framework.Test; - +import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; -import org.eclipse.cdt.core.testplugin.util.BaseTestCase; +import junit.framework.Test; public class CPPParameterGuessingTests extends AbstractContentAssistTest { private static final String HEADER_FILE_NAME = "PGTest.h"; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CParameterGuessingTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CParameterGuessingTests.java index 7bc75a45db6..cf8dd023ac9 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CParameterGuessingTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CParameterGuessingTests.java @@ -16,11 +16,10 @@ package org.eclipse.cdt.ui.tests.text.contentassist2; import java.util.HashMap; import java.util.Map; +import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; -import org.eclipse.cdt.core.testplugin.util.BaseTestCase; - import junit.framework.Test; public class CParameterGuessingTests extends AbstractContentAssistTest { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionProposalsBaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionProposalsBaseTest.java index 00a1604f7d9..aa5408b938c 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionProposalsBaseTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionProposalsBaseTest.java @@ -23,6 +23,7 @@ package org.eclipse.cdt.ui.tests.text.contentassist2; import java.io.FileInputStream; import java.io.FileNotFoundException; +import org.eclipse.cdt.ui.testplugin.CTestPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; @@ -30,8 +31,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; -import org.eclipse.cdt.ui.testplugin.CTestPlugin; - public abstract class CompletionProposalsBaseTest extends AbstractContentAssistTest { private boolean fFailingTest; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTestBase.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTestBase.java index 05ce086d47b..2044c83fb00 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTestBase.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTestBase.java @@ -13,13 +13,12 @@ package org.eclipse.cdt.ui.tests.text.contentassist2; import static org.eclipse.cdt.ui.tests.text.contentassist2.AbstractContentAssistTest.CompareType.CONTEXT; import static org.eclipse.cdt.ui.tests.text.contentassist2.AbstractContentAssistTest.CompareType.REPLACEMENT; +import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference; - public class CompletionTestBase extends AbstractContentAssistTest { private static final String HEADER_FILE_NAME = "CompletionTest.h"; private static final String SOURCE_FILE_NAME = "CompletionTest.cpp"; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests.java index a60ff9b37bd..14b25dbe037 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests.java @@ -32,16 +32,14 @@ import java.io.IOException; import java.util.HashSet; import java.util.Set; -import junit.framework.Test; - -import org.eclipse.core.resources.IFile; -import org.eclipse.jface.text.IDocument; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.testplugin.TestScannerProvider; import org.eclipse.cdt.core.testplugin.util.BaseTestCase; - import org.eclipse.cdt.internal.ui.text.contentassist.CCompletionProposal; +import org.eclipse.core.resources.IFile; +import org.eclipse.jface.text.IDocument; + +import junit.framework.Test; /** * A collection of code completion tests. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests_PlainC.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests_PlainC.java index 547529964f4..9150aee571c 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests_PlainC.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests_PlainC.java @@ -16,14 +16,13 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.text.contentassist2; -import junit.framework.Test; - +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.jface.text.IDocument; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.testplugin.util.BaseTestCase; +import junit.framework.Test; /** * Completion tests for plain C. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/HelpProposalTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/HelpProposalTests.java index 75163b287cb..f27fc30f564 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/HelpProposalTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/HelpProposalTests.java @@ -13,9 +13,8 @@ package org.eclipse.cdt.ui.tests.text.contentassist2; import static org.eclipse.cdt.ui.tests.text.contentassist2.AbstractContentAssistTest.CompareType.ID; import org.eclipse.cdt.core.testplugin.util.BaseTestCase; -import org.eclipse.cdt.ui.tests.chelp.CHelpTestInfoProvider; - import org.eclipse.cdt.internal.ui.text.contentassist.CCompletionProposal; +import org.eclipse.cdt.ui.tests.chelp.CHelpTestInfoProvider; import junit.framework.Test; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ParameterHintTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ParameterHintTests.java index 62e3f611bdc..e89a2631121 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ParameterHintTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ParameterHintTests.java @@ -15,13 +15,12 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.text.contentassist2; -import junit.framework.Test; - +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.testplugin.util.BaseTestCase; +import junit.framework.Test; public class ParameterHintTests extends AbstractContentAssistTest { private static final String HEADER_FILE_NAME = "PHTest.h"; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ShowCamelCasePreferenceTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ShowCamelCasePreferenceTest.java index 145548e04fc..0f02a71824a 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ShowCamelCasePreferenceTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ShowCamelCasePreferenceTest.java @@ -13,16 +13,14 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.text.contentassist2; -import junit.framework.Test; - +import org.eclipse.cdt.core.testplugin.util.BaseTestCase; +import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.preferences.InstanceScope; -import org.eclipse.cdt.core.testplugin.util.BaseTestCase; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference; +import junit.framework.Test; /** * Test the correct response to the value of {@link ContentAssistPreference#SHOW_CAMEL_CASE_MATCHES}. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/TemplateProposalTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/TemplateProposalTest.java index 2c70d23bcb5..6f302e8e74e 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/TemplateProposalTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/TemplateProposalTest.java @@ -13,18 +13,16 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.text.contentassist2; -import junit.framework.Test; - +import org.eclipse.cdt.core.testplugin.util.BaseTestCase; +import org.eclipse.cdt.internal.corext.template.c.CContextType; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.jface.text.templates.Template; import org.eclipse.jface.text.templates.persistence.TemplatePersistenceData; import org.eclipse.jface.text.templates.persistence.TemplateStore; -import org.eclipse.cdt.core.testplugin.util.BaseTestCase; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.corext.template.c.CContextType; +import junit.framework.Test; public class TemplateProposalTest extends AbstractContentAssistTest { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/CommentOwnerManagerTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/CommentOwnerManagerTests.java index efa80b7c00b..dc361d7560b 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/CommentOwnerManagerTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/CommentOwnerManagerTests.java @@ -13,21 +13,19 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.text.doctools; -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; - import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.util.BaseTestCase; +import org.eclipse.cdt.internal.ui.text.doctools.DocCommentOwnerManager; +import org.eclipse.cdt.internal.ui.text.doctools.NullDocCommentOwner; import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; import org.eclipse.cdt.ui.text.doctools.IDocCommentOwnershipListener; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.cdt.internal.ui.text.doctools.DocCommentOwnerManager; -import org.eclipse.cdt.internal.ui.text.doctools.NullDocCommentOwner; +import junit.framework.Test; +import junit.framework.TestSuite; /** * Test comment ownership mapping diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/DocCommentHighlightingTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/DocCommentHighlightingTest.java index daf776c1ae9..40bd5f3db07 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/DocCommentHighlightingTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/DocCommentHighlightingTest.java @@ -17,10 +17,16 @@ package org.eclipse.cdt.ui.tests.text.doctools; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestSuite; - +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.text.doctools.DocCommentOwnerManager; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.testplugin.Accessor; +import org.eclipse.cdt.ui.testplugin.EditorTestHelper; +import org.eclipse.cdt.ui.testplugin.ResourceTestHelper; +import org.eclipse.cdt.ui.tests.BaseUITestCase; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.BadLocationException; @@ -39,17 +45,9 @@ import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.texteditor.AbstractTextEditor; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.testplugin.Accessor; -import org.eclipse.cdt.ui.testplugin.EditorTestHelper; -import org.eclipse.cdt.ui.testplugin.ResourceTestHelper; -import org.eclipse.cdt.ui.tests.BaseUITestCase; - -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.text.doctools.DocCommentOwnerManager; +import junit.framework.Assert; +import junit.framework.Test; +import junit.framework.TestSuite; public class DocCommentHighlightingTest extends BaseUITestCase { private static final DocCommentOwnerManager DCMAN = DocCommentOwnerManager.getInstance(); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/TestGenericTagConfiguration.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/TestGenericTagConfiguration.java index 9be6482624c..cb5404631b7 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/TestGenericTagConfiguration.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/TestGenericTagConfiguration.java @@ -13,6 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.text.doctools; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.doctools.generic.AbstractGenericTagDocCommentViewerConfiguration; +import org.eclipse.cdt.ui.text.doctools.generic.GenericDocTag; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.jface.text.BadLocationException; @@ -20,10 +23,6 @@ import org.eclipse.jface.text.IAutoEditStrategy; import org.eclipse.jface.text.IDocument; import org.eclipse.swt.graphics.RGB; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.doctools.generic.AbstractGenericTagDocCommentViewerConfiguration; -import org.eclipse.cdt.ui.text.doctools.generic.GenericDocTag; - public class TestGenericTagConfiguration extends AbstractGenericTagDocCommentViewerConfiguration { public static final RGB DEFAULTRGB = new RGB(63, 95, 191); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/doxygen/DoxygenCCommentAutoEditStrategyTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/doxygen/DoxygenCCommentAutoEditStrategyTest.java index 1d42fca1468..0747586e9bf 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/doxygen/DoxygenCCommentAutoEditStrategyTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/doxygen/DoxygenCCommentAutoEditStrategyTest.java @@ -17,30 +17,27 @@ package org.eclipse.cdt.ui.tests.text.doctools.doxygen; import java.util.HashMap; -import junit.framework.Test; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.Document; -import org.eclipse.jface.text.IDocument; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.util.TestSourceReader; +import org.eclipse.cdt.internal.core.model.TranslationUnit; +import org.eclipse.cdt.internal.ui.text.CAutoIndentStrategy; +import org.eclipse.cdt.internal.ui.text.CTextTools; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.tests.text.AbstractAutoEditTest; import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.cdt.ui.text.doctools.DefaultMultilineCommentAutoEditStrategy; import org.eclipse.cdt.ui.text.doctools.doxygen.DoxygenMultilineAutoEditStrategy; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.Document; +import org.eclipse.jface.text.IDocument; -import org.eclipse.cdt.internal.core.model.TranslationUnit; - -import org.eclipse.cdt.internal.ui.text.CAutoIndentStrategy; -import org.eclipse.cdt.internal.ui.text.CTextTools; +import junit.framework.Test; /** * Testing the auto indent strategies. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/doxygen/DoxygenCCommentSingleAutoEditStrategyTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/doxygen/DoxygenCCommentSingleAutoEditStrategyTest.java index 2162ed6ea8a..c46c0397482 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/doxygen/DoxygenCCommentSingleAutoEditStrategyTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/doxygen/DoxygenCCommentSingleAutoEditStrategyTest.java @@ -17,30 +17,27 @@ package org.eclipse.cdt.ui.tests.text.doctools.doxygen; import java.util.HashMap; -import junit.framework.Test; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.Document; -import org.eclipse.jface.text.IDocument; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.util.TestSourceReader; +import org.eclipse.cdt.internal.core.model.TranslationUnit; +import org.eclipse.cdt.internal.ui.text.CAutoIndentStrategy; +import org.eclipse.cdt.internal.ui.text.CTextTools; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.tests.text.AbstractAutoEditTest; import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.cdt.ui.text.doctools.DefaultMultilineCommentAutoEditStrategy; import org.eclipse.cdt.ui.text.doctools.doxygen.DoxygenSingleAutoEditStrategy; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.Document; +import org.eclipse.jface.text.IDocument; -import org.eclipse.cdt.internal.core.model.TranslationUnit; - -import org.eclipse.cdt.internal.ui.text.CAutoIndentStrategy; -import org.eclipse.cdt.internal.ui.text.CTextTools; +import junit.framework.Test; /** * Testing the auto indent strategies. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/BaseSelectionTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/BaseSelectionTests.java index b85efa4a32f..1fcaceb245f 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/BaseSelectionTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/BaseSelectionTests.java @@ -13,6 +13,21 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.text.selection; +import org.eclipse.cdt.core.dom.ast.IASTName; +import org.eclipse.cdt.core.dom.ast.IASTNode; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; +import org.eclipse.cdt.internal.core.parser.ParserException; +import org.eclipse.cdt.internal.ui.editor.ASTProvider; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.search.actions.OpenDeclarationsAction; +import org.eclipse.cdt.internal.ui.search.actions.OpenDeclarationsAction.ITargetDisambiguator; +import org.eclipse.cdt.internal.ui.search.actions.SelectionParseAction; +import org.eclipse.cdt.ui.testplugin.EditorTestHelper; +import org.eclipse.cdt.ui.tests.BaseUITestCase; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; @@ -28,24 +43,6 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.FileEditorInput; -import org.eclipse.cdt.core.dom.ast.IASTName; -import org.eclipse.cdt.core.dom.ast.IASTNode; -import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.testplugin.EditorTestHelper; -import org.eclipse.cdt.ui.tests.BaseUITestCase; - -import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; -import org.eclipse.cdt.internal.core.parser.ParserException; - -import org.eclipse.cdt.internal.ui.editor.ASTProvider; -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.search.actions.OpenDeclarationsAction; -import org.eclipse.cdt.internal.ui.search.actions.SelectionParseAction; -import org.eclipse.cdt.internal.ui.search.actions.OpenDeclarationsAction.ITargetDisambiguator; - /** * Base class for all selection tests, using the indexer or not. */ diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/BaseSelectionTestsIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/BaseSelectionTestsIndexer.java index d7f098e76f2..ee1000f2de1 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/BaseSelectionTestsIndexer.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/BaseSelectionTestsIndexer.java @@ -19,6 +19,11 @@ import java.io.ByteArrayInputStream; import java.io.File; import java.io.InputStream; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.testplugin.FileManager; +import org.eclipse.cdt.internal.core.parser.ParserException; +import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds; +import org.eclipse.cdt.internal.ui.search.actions.OpenDeclarationsAction; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; @@ -44,14 +49,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.FileEditorInput; import org.eclipse.ui.texteditor.AbstractTextEditor; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.testplugin.FileManager; - -import org.eclipse.cdt.internal.core.parser.ParserException; - -import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds; -import org.eclipse.cdt.internal.ui.search.actions.OpenDeclarationsAction; - /** * Base test class for testing Ctrl_F3/F3 with the indexers. * diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsIndexer.java index 58c244c839a..fec4270ace7 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsIndexer.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsIndexer.java @@ -16,15 +16,6 @@ package org.eclipse.cdt.ui.tests.text.selection; import java.io.IOException; -import junit.framework.Test; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.part.FileEditorInput; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.dom.ast.IASTFileLocation; @@ -37,9 +28,16 @@ import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.util.TestSourceReader; +import org.eclipse.cdt.internal.core.dom.parser.ASTNode; import org.eclipse.cdt.ui.testplugin.CTestPlugin; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.part.FileEditorInput; -import org.eclipse.cdt.internal.core.dom.parser.ASTNode; +import junit.framework.Test; /** * Test Ctrl-F3/F3 with the DOM Indexer for a C++ project. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsNoIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsNoIndexer.java index ec19f49510b..6e2d290a75a 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsNoIndexer.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsNoIndexer.java @@ -21,21 +21,6 @@ import java.io.InputStream; import java.io.StringWriter; import java.io.Writer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IWorkspace; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.text.IDocument; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.texteditor.ITextEditor; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier; @@ -47,11 +32,23 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPConstructor; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.FileManager; - import org.eclipse.cdt.internal.core.dom.parser.ASTNode; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTNameBase; - import org.eclipse.cdt.internal.ui.search.actions.OpenDeclarationsAction; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.jface.text.IDocument; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.texteditor.ITextEditor; import junit.framework.Test; import junit.framework.TestSuite; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsIndexer.java index d8da998ebae..e0884819704 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsIndexer.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsIndexer.java @@ -15,15 +15,6 @@ package org.eclipse.cdt.ui.tests.text.selection; import java.io.IOException; -import junit.framework.Test; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.part.FileEditorInput; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.dom.ast.IASTFileLocation; @@ -33,9 +24,16 @@ import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.util.TestSourceReader; +import org.eclipse.cdt.internal.core.dom.parser.ASTNode; import org.eclipse.cdt.ui.testplugin.CTestPlugin; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.part.FileEditorInput; -import org.eclipse.cdt.internal.core.dom.parser.ASTNode; +import junit.framework.Test; public class CSelectionTestsIndexer extends BaseSelectionTestsIndexer { private String sourceIndexerID; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsNoIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsNoIndexer.java index 0e7953a0b5e..b033d9b95fd 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsNoIndexer.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsNoIndexer.java @@ -19,9 +19,14 @@ import java.io.ByteArrayInputStream; import java.io.File; import java.io.InputStream; -import junit.framework.Test; -import junit.framework.TestSuite; - +import org.eclipse.cdt.core.dom.IPDOMManager; +import org.eclipse.cdt.core.dom.ast.IASTName; +import org.eclipse.cdt.core.dom.ast.IASTNode; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.core.testplugin.FileManager; +import org.eclipse.cdt.internal.core.dom.parser.ASTNode; +import org.eclipse.cdt.internal.ui.search.actions.OpenDeclarationsAction; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; @@ -33,16 +38,8 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; -import org.eclipse.cdt.core.dom.IPDOMManager; -import org.eclipse.cdt.core.dom.ast.IASTName; -import org.eclipse.cdt.core.dom.ast.IASTNode; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.core.testplugin.FileManager; - -import org.eclipse.cdt.internal.core.dom.parser.ASTNode; - -import org.eclipse.cdt.internal.ui.search.actions.OpenDeclarationsAction; +import junit.framework.Test; +import junit.framework.TestSuite; /** * It is required to test the selection performance independent of the indexer to make sure that the DOM is functioning properly. diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/ResolveBindingTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/ResolveBindingTests.java index c48643e2d0f..306a3e0098e 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/ResolveBindingTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/ResolveBindingTests.java @@ -15,14 +15,6 @@ package org.eclipse.cdt.ui.tests.text.selection; -import junit.framework.Test; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.NullProgressMonitor; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.dom.ast.IASTName; @@ -39,6 +31,13 @@ import org.eclipse.cdt.core.model.LanguageManager; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.ui.tests.BaseUITestCase; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; + +import junit.framework.Test; public class ResolveBindingTests extends BaseUITestCase { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/CTypeHierarchyTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/CTypeHierarchyTest.java index db91bbe06cf..8e7a7f94ce2 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/CTypeHierarchyTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/CTypeHierarchyTest.java @@ -13,13 +13,12 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.typehierarchy; -import junit.framework.Test; - +import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.core.resources.IFile; import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeItem; -import org.eclipse.cdt.internal.ui.editor.CEditor; +import junit.framework.Test; public class CTypeHierarchyTest extends TypeHierarchyBaseTest { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/CppTypeHierarchyTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/CppTypeHierarchyTest.java index 6d57febe3e4..2885133cbf7 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/CppTypeHierarchyTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/CppTypeHierarchyTest.java @@ -13,13 +13,12 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.typehierarchy; -import junit.framework.Test; - +import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.core.resources.IFile; import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeItem; -import org.eclipse.cdt.internal.ui.editor.CEditor; +import junit.framework.Test; public class CppTypeHierarchyTest extends TypeHierarchyBaseTest { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/QuickTypeHierarchyTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/QuickTypeHierarchyTest.java index e8819d16714..fa8cd71669e 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/QuickTypeHierarchyTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/QuickTypeHierarchyTest.java @@ -13,14 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.typehierarchy; -import junit.framework.Test; - +import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.Platform; import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeItem; -import org.eclipse.cdt.internal.ui.editor.CEditor; +import junit.framework.Test; public class QuickTypeHierarchyTest extends TypeHierarchyBaseTest { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyAcrossProjectsTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyAcrossProjectsTest.java index ca88d72b194..3633488b153 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyAcrossProjectsTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyAcrossProjectsTest.java @@ -13,8 +13,12 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.typehierarchy; -import junit.framework.Test; - +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.IPDOMManager; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.core.testplugin.TestScannerProvider; +import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; @@ -22,13 +26,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeItem; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.IPDOMManager; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.core.testplugin.TestScannerProvider; - -import org.eclipse.cdt.internal.ui.editor.CEditor; +import junit.framework.Test; public class TypeHierarchyAcrossProjectsTest extends TypeHierarchyBaseTest { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyBaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyBaseTest.java index 8a24d0eb76c..4ea405784c8 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyBaseTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyBaseTest.java @@ -13,6 +13,17 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.typehierarchy; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.IPDOMManager; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.typehierarchy.THViewPart; +import org.eclipse.cdt.internal.ui.typehierarchy.TypeHierarchyUI; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.testplugin.EditorTestHelper; +import org.eclipse.cdt.ui.tests.BaseUITestCase; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.jface.text.ITextSelection; @@ -32,19 +43,6 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.ide.IDE; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.IPDOMManager; -import org.eclipse.cdt.core.index.IIndex; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.testplugin.EditorTestHelper; -import org.eclipse.cdt.ui.tests.BaseUITestCase; - -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.typehierarchy.THViewPart; -import org.eclipse.cdt.internal.ui.typehierarchy.TypeHierarchyUI; - public class TypeHierarchyBaseTest extends BaseUITestCase { protected ICProject fCProject; protected IIndex fIndex; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/viewsupport/AsyncViewerTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/viewsupport/AsyncViewerTest.java index 0217d924028..b878c1d74c0 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/viewsupport/AsyncViewerTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/viewsupport/AsyncViewerTest.java @@ -14,6 +14,10 @@ package org.eclipse.cdt.ui.tests.viewsupport; +import org.eclipse.cdt.internal.ui.viewsupport.AsyncTreeContentProvider; +import org.eclipse.cdt.internal.ui.viewsupport.AsyncTreeWorkInProgressNode; +import org.eclipse.cdt.internal.ui.viewsupport.ExtendedTreeViewer; +import org.eclipse.cdt.ui.tests.BaseUITestCase; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.viewers.LabelProvider; @@ -26,12 +30,6 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.TreeItem; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.ui.tests.BaseUITestCase; - -import org.eclipse.cdt.internal.ui.viewsupport.AsyncTreeContentProvider; -import org.eclipse.cdt.internal.ui.viewsupport.AsyncTreeWorkInProgressNode; -import org.eclipse.cdt.internal.ui.viewsupport.ExtendedTreeViewer; - public class AsyncViewerTest extends BaseUITestCase { private class Node { private String fLabel; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/classwizard/ClassWizardNameTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/classwizard/ClassWizardNameTest.java index 4769d753acc..faa417813f7 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/classwizard/ClassWizardNameTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/classwizard/ClassWizardNameTest.java @@ -13,10 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.wizards.classwizard; -import org.eclipse.core.runtime.IStatus; - import org.eclipse.cdt.ui.tests.BaseUITestCase; import org.eclipse.cdt.ui.wizards.NewClassCreationWizardPage; +import org.eclipse.core.runtime.IStatus; public class ClassWizardNameTest extends BaseUITestCase { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/ProjectSettingsWizardPageMock.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/ProjectSettingsWizardPageMock.java index d69af582287..db0a81ec9ad 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/ProjectSettingsWizardPageMock.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/ProjectSettingsWizardPageMock.java @@ -16,7 +16,6 @@ package org.eclipse.cdt.ui.tests.wizards.settingswizards; import java.util.List; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; - import org.eclipse.cdt.internal.ui.wizards.settingswizards.IProjectSettingsWizardPage; import org.eclipse.cdt.internal.ui.wizards.settingswizards.ISettingsProcessor; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/SettingsImportExportTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/SettingsImportExportTest.java index c3e311bc511..98ac5c52884 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/SettingsImportExportTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/SettingsImportExportTest.java @@ -17,12 +17,6 @@ import java.io.FileWriter; import java.util.Arrays; import java.util.List; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.dialogs.IMessageProvider; - import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICProject; @@ -35,13 +29,17 @@ import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; import org.eclipse.cdt.core.settings.model.ICProjectDescription; import org.eclipse.cdt.core.settings.model.ICSettingEntry; import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.ui.tests.BaseUITestCase; - import org.eclipse.cdt.internal.ui.wizards.settingswizards.ISettingsProcessor; import org.eclipse.cdt.internal.ui.wizards.settingswizards.IncludePathsSettingsProcessor; import org.eclipse.cdt.internal.ui.wizards.settingswizards.MacroSettingsProcessor; import org.eclipse.cdt.internal.ui.wizards.settingswizards.ProjectSettingsExportStrategy; import org.eclipse.cdt.internal.ui.wizards.settingswizards.ProjectSettingsImportStrategy; +import org.eclipse.cdt.ui.tests.BaseUITestCase; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.Path; +import org.eclipse.jface.dialogs.IMessageProvider; public class SettingsImportExportTest extends BaseUITestCase { diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/ElementSelectionDialog.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/ElementSelectionDialog.java index eeda26c8619..132df312430 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/ElementSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/ElementSelectionDialog.java @@ -17,6 +17,23 @@ package org.eclipse.cdt.internal.ui.browser.opentype; import java.util.Arrays; import java.util.HashSet; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.browser.ITypeInfo; +import org.eclipse.cdt.core.browser.IndexTypeInfo; +import org.eclipse.cdt.core.browser.QualifiedTypeName; +import org.eclipse.cdt.core.dom.ast.IBinding; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.index.IIndexBinding; +import org.eclipse.cdt.core.index.IIndexMacro; +import org.eclipse.cdt.core.index.IIndexManager; +import org.eclipse.cdt.core.index.IndexFilter; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.internal.core.browser.IndexModelUtil; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.search.CSearchUtil; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.browser.typeinfo.TypeSelectionDialog; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -39,26 +56,6 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.browser.ITypeInfo; -import org.eclipse.cdt.core.browser.IndexTypeInfo; -import org.eclipse.cdt.core.browser.QualifiedTypeName; -import org.eclipse.cdt.core.dom.ast.IBinding; -import org.eclipse.cdt.core.index.IIndex; -import org.eclipse.cdt.core.index.IIndexBinding; -import org.eclipse.cdt.core.index.IIndexMacro; -import org.eclipse.cdt.core.index.IIndexManager; -import org.eclipse.cdt.core.index.IndexFilter; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.browser.typeinfo.TypeSelectionDialog; - -import org.eclipse.cdt.internal.core.browser.IndexModelUtil; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.search.CSearchUtil; - /** * A dialog to select an element from a filterable list of elements. * diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeAction.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeAction.java index 44a5f0ec4d4..6628da7bd72 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeAction.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeAction.java @@ -15,6 +15,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.browser.opentype; +import org.eclipse.cdt.core.browser.ITypeInfo; +import org.eclipse.cdt.core.browser.ITypeReference; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.util.EditorUtility; import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; @@ -32,14 +38,6 @@ import org.eclipse.ui.IWorkbenchWindowActionDelegate; import org.eclipse.ui.PartInitException; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.core.browser.ITypeInfo; -import org.eclipse.cdt.core.browser.ITypeReference; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ITranslationUnit; - -import org.eclipse.cdt.internal.ui.util.EditorUtility; - /** * @noextend This class is not intended to be subclassed by clients. */ diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLabelProvider.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLabelProvider.java index 0ca96038dcf..ef92fcc9c84 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLabelProvider.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLabelProvider.java @@ -17,11 +17,6 @@ *******************************************************************************/ package org.eclipse.cdt.ui.browser.typeinfo; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IPath; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.swt.graphics.Image; - import org.eclipse.cdt.core.browser.IFunctionInfo; import org.eclipse.cdt.core.browser.IQualifiedTypeName; import org.eclipse.cdt.core.browser.ITypeInfo; @@ -32,9 +27,12 @@ import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.IVariableDeclaration; -import org.eclipse.cdt.ui.CDTSharedImages; - import org.eclipse.cdt.internal.core.model.FunctionDeclaration; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.IPath; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.swt.graphics.Image; /** * @noextend This class is not intended to be subclassed by clients. diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java index 0f280c1dc6d..ecbb2f8d12c 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java @@ -23,6 +23,14 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.eclipse.cdt.core.browser.IQualifiedTypeName; +import org.eclipse.cdt.core.browser.ITypeInfo; +import org.eclipse.cdt.core.browser.ITypeReference; +import org.eclipse.cdt.core.browser.IndexTypeInfo; +import org.eclipse.cdt.core.browser.QualifiedTypeName; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.internal.ui.util.StringMatcher; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleAdapter; @@ -41,16 +49,6 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.ui.dialogs.FilteredList; import org.eclipse.ui.dialogs.TwoPaneElementSelector; -import org.eclipse.cdt.core.browser.IQualifiedTypeName; -import org.eclipse.cdt.core.browser.ITypeInfo; -import org.eclipse.cdt.core.browser.ITypeReference; -import org.eclipse.cdt.core.browser.IndexTypeInfo; -import org.eclipse.cdt.core.browser.QualifiedTypeName; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.util.StringMatcher; - /** * A dialog to select a type from a list of types. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/InclusionContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/InclusionContext.java index be878e466b5..97fc167b598 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/InclusionContext.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/InclusionContext.java @@ -19,28 +19,25 @@ import java.util.Map; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; - import org.eclipse.cdt.core.CCorePreferenceConstants; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.parser.IScannerInfo; -import org.eclipse.cdt.utils.PathUtil; - import org.eclipse.cdt.internal.core.parser.scanner.CPreprocessor; import org.eclipse.cdt.internal.core.parser.scanner.IncludeSearchPath; import org.eclipse.cdt.internal.core.parser.scanner.IncludeSearchPathElement; import org.eclipse.cdt.internal.core.parser.scanner.ScannerUtility; import org.eclipse.cdt.internal.core.resources.ResourceLookup; - import org.eclipse.cdt.internal.ui.editor.SourceHeaderPartnerFinder; import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeGroupStyle; import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeGroupStyle.IncludeKind; import org.eclipse.cdt.internal.ui.refactoring.includes.IncludePreferences; +import org.eclipse.cdt.utils.PathUtil; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.Path; public class InclusionContext { private static final String[] EMPTY_STRING_ARRAY = new String[0]; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/StubUtility.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/StubUtility.java index 3bbbba6b5e4..c9be45ef9aa 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/StubUtility.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/StubUtility.java @@ -23,6 +23,30 @@ import java.util.List; import java.util.Set; import java.util.UUID; +import org.eclipse.cdt.core.CConventions; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.CCorePreferenceConstants; +import org.eclipse.cdt.core.dom.ast.gnu.cpp.GPPLanguage; +import org.eclipse.cdt.core.dom.parser.AbstractCLikeLanguage; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.IBuffer; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.ISourceRoot; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.corext.template.c.CodeTemplateContext; +import org.eclipse.cdt.internal.corext.template.c.CodeTemplateContextType; +import org.eclipse.cdt.internal.corext.template.c.FileTemplateContext; +import org.eclipse.cdt.internal.corext.template.c.FileTemplateContextType; +import org.eclipse.cdt.internal.corext.util.Strings; +import org.eclipse.cdt.internal.ui.text.CBreakIterator; +import org.eclipse.cdt.internal.ui.util.NameComposer; +import org.eclipse.cdt.internal.ui.viewsupport.ProjectTemplateStore; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.utils.PathUtil; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -52,33 +76,6 @@ import org.eclipse.text.edits.MultiTextEdit; import com.ibm.icu.text.BreakIterator; -import org.eclipse.cdt.core.CConventions; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.CCorePreferenceConstants; -import org.eclipse.cdt.core.dom.ast.gnu.cpp.GPPLanguage; -import org.eclipse.cdt.core.dom.parser.AbstractCLikeLanguage; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.IBuffer; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.ISourceRoot; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.utils.PathUtil; - -import org.eclipse.cdt.internal.corext.template.c.CodeTemplateContext; -import org.eclipse.cdt.internal.corext.template.c.CodeTemplateContextType; -import org.eclipse.cdt.internal.corext.template.c.FileTemplateContext; -import org.eclipse.cdt.internal.corext.template.c.FileTemplateContextType; -import org.eclipse.cdt.internal.corext.util.Strings; - -import org.eclipse.cdt.internal.ui.text.CBreakIterator; -import org.eclipse.cdt.internal.ui.util.NameComposer; -import org.eclipse.cdt.internal.ui.viewsupport.ProjectTemplateStore; - public class StubUtility { private static final String[] EMPTY = {}; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/StyledInclude.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/StyledInclude.java index 4e52f1de0fb..7d8bfd57123 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/StyledInclude.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/StyledInclude.java @@ -13,11 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.corext.codemanipulation; -import org.eclipse.core.runtime.IPath; - import org.eclipse.cdt.core.dom.ast.IASTPreprocessorIncludeStatement; - import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeGroupStyle; +import org.eclipse.core.runtime.IPath; /** * Represents a new or an existing include statement together with the style associated with it. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/fix/LinkedProposalModel.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/fix/LinkedProposalModel.java index 191dd72f0b5..f435b0d82a6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/fix/LinkedProposalModel.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/fix/LinkedProposalModel.java @@ -19,7 +19,6 @@ import java.util.Iterator; import java.util.Map; import org.eclipse.cdt.core.dom.rewrite.ITrackedNodePosition; - import org.eclipse.cdt.internal.corext.fix.LinkedProposalPositionGroup.PositionInformation; public class LinkedProposalModel { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/fix/LinkedProposalPositionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/fix/LinkedProposalPositionGroup.java index 703d4935f28..ce56e364793 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/fix/LinkedProposalPositionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/fix/LinkedProposalPositionGroup.java @@ -17,6 +17,7 @@ package org.eclipse.cdt.internal.corext.fix; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.core.dom.rewrite.ITrackedNodePosition; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.text.link.LinkedModeModel; import org.eclipse.jface.text.link.LinkedPosition; @@ -24,8 +25,6 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.text.edits.ReplaceEdit; import org.eclipse.text.edits.TextEdit; -import org.eclipse.cdt.core.dom.rewrite.ITrackedNodePosition; - public class LinkedProposalPositionGroup { /** * {@link LinkedProposalPositionGroup.PositionInformation} describes a position diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/FlowAnalyzer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/FlowAnalyzer.java index 77e521de038..9b8e209df83 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/FlowAnalyzer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/FlowAnalyzer.java @@ -18,9 +18,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.Region; - import org.eclipse.cdt.core.dom.ast.ASTGenericVisitor; import org.eclipse.cdt.core.dom.ast.IASTArrayDeclarator; import org.eclipse.cdt.core.dom.ast.IASTArraySubscriptExpression; @@ -84,10 +81,11 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTSimpleTypeConstructorExpression; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTryBlockStatement; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTWhileStatement; import org.eclipse.cdt.core.dom.ast.gnu.c.ICASTKnRFunctionDeclarator; - import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVariableReadWriteFlags; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; import org.eclipse.cdt.internal.core.pdom.dom.PDOMName; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; /** * Special flow analyzer to determine the return value of the extracted method diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/FlowContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/FlowContext.java index 6fc93947916..cbba70d5c72 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/FlowContext.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/FlowContext.java @@ -17,8 +17,6 @@ package org.eclipse.cdt.internal.corext.refactoring.code.flow; import java.util.ArrayList; import java.util.List; -import org.eclipse.core.runtime.Assert; - import org.eclipse.cdt.core.dom.ast.IASTDeclaration; import org.eclipse.cdt.core.dom.ast.IASTDeclarator; import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition; @@ -27,8 +25,8 @@ import org.eclipse.cdt.core.dom.ast.IType; import org.eclipse.cdt.core.dom.ast.IVariable; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCatchHandler; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTryBlockStatement; - import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; +import org.eclipse.core.runtime.Assert; public class FlowContext extends LocalVariableIndex { private static class ComputeMode { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/InOutFlowAnalyzer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/InOutFlowAnalyzer.java index abbf377ad12..0ff16feac3f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/InOutFlowAnalyzer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/InOutFlowAnalyzer.java @@ -34,7 +34,6 @@ import org.eclipse.cdt.core.dom.ast.IVariable; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCatchHandler; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTRangeBasedForStatement; import org.eclipse.cdt.core.dom.ast.gnu.c.ICASTKnRFunctionDeclarator; - import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; public class InOutFlowAnalyzer extends FlowAnalyzer { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/InputFlowAnalyzer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/InputFlowAnalyzer.java index 71e387615b8..4e002e600d5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/InputFlowAnalyzer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/InputFlowAnalyzer.java @@ -19,9 +19,6 @@ *******************************************************************************/ package org.eclipse.cdt.internal.corext.refactoring.code.flow; -import org.eclipse.core.runtime.Assert; -import org.eclipse.jface.text.IRegion; - import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTConditionalExpression; import org.eclipse.cdt.core.dom.ast.IASTDoStatement; @@ -40,9 +37,10 @@ import org.eclipse.cdt.core.dom.ast.IASTWhileStatement; import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTRangeBasedForStatement; import org.eclipse.cdt.core.parser.util.ArrayUtil; - import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPSemantics; import org.eclipse.cdt.internal.core.dom.rewrite.util.ASTNodes; +import org.eclipse.core.runtime.Assert; +import org.eclipse.jface.text.IRegion; public class InputFlowAnalyzer extends FlowAnalyzer { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/ReturnFlowInfo.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/ReturnFlowInfo.java index 4cbec5d3feb..fbb88335ecb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/ReturnFlowInfo.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/ReturnFlowInfo.java @@ -16,7 +16,6 @@ package org.eclipse.cdt.internal.corext.refactoring.code.flow; import org.eclipse.cdt.core.dom.ast.IASTExpression; import org.eclipse.cdt.core.dom.ast.IASTReturnStatement; - import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil; class ReturnFlowInfo extends FlowInfo { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/Selection.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/Selection.java index 8e096a5d662..ea57d3832d4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/Selection.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/Selection.java @@ -14,11 +14,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.corext.refactoring.code.flow; -import org.eclipse.core.runtime.Assert; -import org.eclipse.jface.text.IRegion; - import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IASTNode; +import org.eclipse.core.runtime.Assert; +import org.eclipse.jface.text.IRegion; public class Selection { /** Flag indicating that the AST node somehow intersects with the selection. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CContext.java index 00a15f43069..12978105b07 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CContext.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CContext.java @@ -15,6 +15,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.corext.template.c; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; @@ -26,11 +30,6 @@ import org.eclipse.jface.text.templates.TemplateContextType; import org.eclipse.jface.text.templates.TemplateException; import org.eclipse.jface.text.templates.TemplateTranslator; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; - /** * A context for C/C++. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CContextType.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CContextType.java index 5a587c1b57f..7dd16b5da10 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CContextType.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CContextType.java @@ -14,11 +14,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.corext.template.c; +import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.Position; -import org.eclipse.cdt.core.model.ITranslationUnit; - /** * A context type for C/C++ code. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CFormatter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CFormatter.java index 5d06993b606..4e4804c601b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CFormatter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CFormatter.java @@ -22,6 +22,14 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.formatter.CodeFormatter; +import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.internal.corext.util.CodeFormatterUtil; +import org.eclipse.cdt.internal.ui.editor.IndentUtil; +import org.eclipse.cdt.internal.ui.text.FastCPartitionScanner; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.BadPositionCategoryException; @@ -41,17 +49,6 @@ import org.eclipse.text.edits.RangeMarker; import org.eclipse.text.edits.ReplaceEdit; import org.eclipse.text.edits.TextEdit; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.formatter.CodeFormatter; -import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.text.ICPartitions; - -import org.eclipse.cdt.internal.corext.util.CodeFormatterUtil; - -import org.eclipse.cdt.internal.ui.editor.IndentUtil; -import org.eclipse.cdt.internal.ui.text.FastCPartitionScanner; - /** * A template editor using the C/C++ formatter to format a template buffer. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CodeTemplateContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CodeTemplateContext.java index 35fd835fcc8..a3834bdec98 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CodeTemplateContext.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CodeTemplateContext.java @@ -14,10 +14,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.corext.template.c; -import org.eclipse.core.resources.IFile; - import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.core.resources.IFile; /** * A template context for C/C++ code and comment. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CodeTemplateContextType.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CodeTemplateContextType.java index 75034b9fc8e..ab29dc2116e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CodeTemplateContextType.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CodeTemplateContextType.java @@ -15,16 +15,14 @@ *******************************************************************************/ package org.eclipse.cdt.internal.corext.template.c; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.internal.corext.codemanipulation.StubUtility; import org.eclipse.jface.text.templates.ContextTypeRegistry; import org.eclipse.jface.text.templates.TemplateContext; import org.eclipse.jface.text.templates.TemplateException; import org.eclipse.jface.text.templates.TemplateVariableResolver; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.model.ICProject; - -import org.eclipse.cdt.internal.corext.codemanipulation.StubUtility; - public class CodeTemplateContextType extends FileTemplateContextType { /* Context types */ private static final String CONTEXTTYPE_PREFIX = "org.eclipse.cdt.ui.text.codetemplates."; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CommentContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CommentContext.java index fba60d18918..e2abaa587f5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CommentContext.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CommentContext.java @@ -14,6 +14,8 @@ package org.eclipse.cdt.internal.corext.template.c; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.Position; @@ -24,9 +26,6 @@ import org.eclipse.jface.text.templates.TemplateContextType; import org.eclipse.jface.text.templates.TemplateException; import org.eclipse.jface.text.templates.TemplateTranslator; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ITranslationUnit; - /** * A context for (block) comments. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CommentContextType.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CommentContextType.java index a884d6ee034..fbe117f9e95 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CommentContextType.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CommentContextType.java @@ -14,11 +14,10 @@ package org.eclipse.cdt.internal.corext.template.c; +import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.Position; -import org.eclipse.cdt.core.model.ITranslationUnit; - /** * A context type for comments. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/FileTemplateContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/FileTemplateContext.java index e2a3bb56e21..bb552fffa22 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/FileTemplateContext.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/FileTemplateContext.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.internal.corext.template.c; import java.util.Iterator; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IPath; @@ -30,8 +31,6 @@ import org.eclipse.jface.text.templates.TemplateException; import org.eclipse.jface.text.templates.TemplateTranslator; import org.eclipse.jface.text.templates.TemplateVariableResolver; -import org.eclipse.cdt.ui.CUIPlugin; - /** * A template context for plain file resources. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/FileTemplateContextType.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/FileTemplateContextType.java index e635be1a7f5..c177f4afce0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/FileTemplateContextType.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/FileTemplateContextType.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.corext.template.c; -import com.ibm.icu.text.DateFormat; -import com.ibm.icu.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.internal.corext.util.Messages; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.content.IContentType; @@ -34,7 +33,8 @@ import org.eclipse.jface.text.templates.TemplateVariable; import org.eclipse.jface.text.templates.TemplateVariableResolver; import org.eclipse.jface.text.templates.TemplateVariableType; -import org.eclipse.cdt.internal.corext.util.Messages; +import com.ibm.icu.text.DateFormat; +import com.ibm.icu.text.SimpleDateFormat; /** * A generic template context type for file resources based on content-type. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TranslationUnitContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TranslationUnitContext.java index 7bca9dee004..8f50990579b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TranslationUnitContext.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TranslationUnitContext.java @@ -16,6 +16,12 @@ package org.eclipse.cdt.internal.corext.template.c; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.corext.util.CodeFormatterUtil; +import org.eclipse.cdt.internal.corext.util.Strings; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; @@ -24,14 +30,6 @@ import org.eclipse.jface.text.templates.DocumentTemplateContext; import org.eclipse.jface.text.templates.Template; import org.eclipse.jface.text.templates.TemplateContextType; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ITranslationUnit; - -import org.eclipse.cdt.internal.corext.util.CodeFormatterUtil; -import org.eclipse.cdt.internal.corext.util.Strings; - /** * A translation unit context. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TranslationUnitContextType.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TranslationUnitContextType.java index 7dcd913ca82..194c124bd54 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TranslationUnitContextType.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TranslationUnitContextType.java @@ -16,6 +16,11 @@ package org.eclipse.cdt.internal.corext.template.c; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.IFunctionDeclaration; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.corext.codemanipulation.StubUtility; import org.eclipse.core.runtime.Path; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.Position; @@ -24,13 +29,6 @@ import org.eclipse.jface.text.templates.TemplateContext; import org.eclipse.jface.text.templates.TemplateContextType; import org.eclipse.jface.text.templates.TemplateVariableResolver; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.IFunctionDeclaration; -import org.eclipse.cdt.core.model.ITranslationUnit; - -import org.eclipse.cdt.internal.corext.codemanipulation.StubUtility; - /** * A context type for translation units. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/CModelUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/CModelUtil.java index 60b6e71acd6..b064896175e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/CModelUtil.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/CModelUtil.java @@ -14,10 +14,6 @@ *******************************************************************************/ package org.eclipse.cdt.internal.corext.util; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; - import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.ICContainer; import org.eclipse.cdt.core.model.ICElement; @@ -26,8 +22,10 @@ import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ISourceRoot; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.model.IWorkingCopy; - import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; public class CModelUtil { /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/CodeFormatterUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/CodeFormatterUtil.java index 86521e02c79..41fd79a7897 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/CodeFormatterUtil.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/CodeFormatterUtil.java @@ -15,13 +15,12 @@ package org.eclipse.cdt.internal.corext.util; import java.util.Map; -import org.eclipse.text.edits.TextEdit; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.ToolFactory; import org.eclipse.cdt.core.formatter.CodeFormatter; import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.text.edits.TextEdit; public class CodeFormatterUtil { /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/SimplePositionTracker.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/SimplePositionTracker.java index 775075672e6..d0938e84605 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/SimplePositionTracker.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/SimplePositionTracker.java @@ -14,12 +14,11 @@ package org.eclipse.cdt.internal.corext.util; +import org.eclipse.cdt.internal.core.PositionTracker; import org.eclipse.jface.text.DocumentEvent; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IPositionUpdater; -import org.eclipse.cdt.internal.core.PositionTracker; - /** * A simple general purpose position tracker. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/Strings.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/Strings.java index f44a3d92627..5d2c6cc1ac0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/Strings.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/Strings.java @@ -15,6 +15,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.corext.util; +import org.eclipse.cdt.core.formatter.IndentManipulation; +import org.eclipse.cdt.core.model.ICProject; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.action.LegacyActionTools; import org.eclipse.jface.text.BadLocationException; @@ -24,9 +26,6 @@ import org.eclipse.jface.text.IRegion; import org.eclipse.jface.viewers.StyledString; import org.eclipse.osgi.util.TextProcessor; -import org.eclipse.cdt.core.formatter.IndentManipulation; -import org.eclipse.cdt.core.model.ICProject; - /** * Helper class to provide String manipulation functions not available in standard JDK. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java index 86db9540e59..bc866c132b9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java @@ -20,16 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.viewers.ITreeContentProvider; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.ui.model.IWorkbenchAdapter; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CoreModel; @@ -55,6 +45,15 @@ import org.eclipse.cdt.ui.CDTUITools; import org.eclipse.cdt.ui.CElementGrouping; import org.eclipse.cdt.ui.IncludesGrouping; import org.eclipse.cdt.ui.NamespacesGrouping; +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.ui.model.IWorkbenchAdapter; /** * A base content provider for C elements. It provides access to the diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BinaryPropertySource.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BinaryPropertySource.java index dea40c529ac..f88bc799547 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BinaryPropertySource.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BinaryPropertySource.java @@ -14,6 +14,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui; +import org.eclipse.cdt.core.model.IBinary; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.jface.viewers.IBasicPropertyConstants; import org.eclipse.ui.views.properties.FilePropertySource; @@ -21,9 +23,6 @@ import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertySource; import org.eclipse.ui.views.properties.PropertyDescriptor; -import org.eclipse.cdt.core.model.IBinary; -import org.eclipse.cdt.ui.CUIPlugin; - public class BinaryPropertySource extends FilePropertySource { private final static String ELF_CPU = "CElementProperties.elf_cpu"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BusyCursorJobRunner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BusyCursorJobRunner.java index 96fb9016207..682a47ebf2f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BusyCursorJobRunner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BusyCursorJobRunner.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.internal.ui; import java.lang.reflect.InvocationTargetException; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -30,8 +31,6 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.progress.IProgressService; -import org.eclipse.cdt.ui.CUIPlugin; - /** * Synchronously executes a {@link Job} while allowing user to cancel it if it takes too long. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CActionFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CActionFilter.java index 7690eb5c727..f004a162c85 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CActionFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CActionFilter.java @@ -15,11 +15,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui; +import org.eclipse.cdt.core.model.ICElement; import org.eclipse.core.resources.IResource; import org.eclipse.ui.IActionFilter; -import org.eclipse.cdt.core.model.ICElement; - /** * An implementation of the IWorkbenchAdapter for CElements. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementAdapterFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementAdapterFactory.java index 80670e4d1f6..27fc22818a1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementAdapterFactory.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementAdapterFactory.java @@ -16,6 +16,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui; +import org.eclipse.cdt.core.model.IBinary; +import org.eclipse.cdt.core.model.ICElement; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IAdapterFactory; @@ -27,9 +29,6 @@ import org.eclipse.ui.views.properties.FilePropertySource; import org.eclipse.ui.views.properties.IPropertySource; import org.eclipse.ui.views.properties.ResourcePropertySource; -import org.eclipse.cdt.core.model.IBinary; -import org.eclipse.cdt.core.model.ICElement; - /** * Implements basic UI support for C elements. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementPropertySource.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementPropertySource.java index a96e351d7ba..8dc11b8e5f9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementPropertySource.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementPropertySource.java @@ -14,14 +14,13 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.viewers.IBasicPropertyConstants; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertySource; import org.eclipse.ui.views.properties.PropertyDescriptor; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.ui.CUIPlugin; - public class CElementPropertySource implements IPropertySource { private final static String LABEL = "CElementProperties.name"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPerspectiveFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPerspectiveFactory.java index 34e241fc25c..7dd9a2fbbb2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPerspectiveFactory.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPerspectiveFactory.java @@ -15,6 +15,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui; +import org.eclipse.cdt.internal.ui.wizards.CWizardRegistry; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.search.ui.NewSearchUI; import org.eclipse.ui.IFolderLayout; import org.eclipse.ui.IPageLayout; @@ -22,10 +24,6 @@ import org.eclipse.ui.IPerspectiveFactory; import org.eclipse.ui.console.IConsoleConstants; import org.eclipse.ui.navigator.resources.ProjectExplorer; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.wizards.CWizardRegistry; - public class CPerspectiveFactory implements IPerspectiveFactory { /** * Constructs a new Default layout engine. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java index 61afe15f6ee..b2e759068e0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java @@ -25,6 +25,8 @@ import java.net.URL; import java.util.HashMap; import java.util.Map; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; @@ -34,9 +36,6 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.swt.graphics.Image; import org.osgi.framework.Bundle; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; - /** * This is internal class with some helper methods for handling images. * The use of this class for images managed by registry is deprecated, diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CProjectAdapterFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CProjectAdapterFactory.java index 146f3ff07ab..172e0e63736 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CProjectAdapterFactory.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CProjectAdapterFactory.java @@ -14,11 +14,10 @@ package org.eclipse.cdt.internal.ui; +import org.eclipse.cdt.core.model.ICProject; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IAdapterFactory; -import org.eclipse.cdt.core.model.ICProject; - /** * Adapter factory to adapt <code>ICProject</code> to <code>IProject</code>. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CWorkbenchAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CWorkbenchAdapter.java index 43bc0f8c78c..692f03a5495 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CWorkbenchAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CWorkbenchAdapter.java @@ -15,16 +15,14 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.ui.model.IWorkbenchAdapter; - import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.IParent; +import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; import org.eclipse.cdt.ui.CElementLabelProvider; import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.ui.model.IWorkbenchAdapter; /** * An implementation of the IWorkbenchAdapter for CElements. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/DeferredCWorkbenchAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/DeferredCWorkbenchAdapter.java index 9303c60c628..674fd9e2350 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/DeferredCWorkbenchAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/DeferredCWorkbenchAdapter.java @@ -13,14 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.IParent; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.ui.progress.IDeferredWorkbenchAdapter; import org.eclipse.ui.progress.IElementCollector; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.IParent; - public class DeferredCWorkbenchAdapter extends CWorkbenchAdapter implements IDeferredWorkbenchAdapter { private ICElement fCElement; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/IContextMenuConstants.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/IContextMenuConstants.java index 494a752acbe..7fc735746b0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/IContextMenuConstants.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/IContextMenuConstants.java @@ -15,9 +15,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui; -import org.eclipse.ui.navigator.ICommonMenuConstants; - import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.ui.navigator.ICommonMenuConstants; /** * Constants for menu groups used in context menus for C views and editors. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/PersistableCElementFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/PersistableCElementFactory.java index c58eaef6c5d..2ad86856e8e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/PersistableCElementFactory.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/PersistableCElementFactory.java @@ -16,6 +16,8 @@ package org.eclipse.cdt.internal.ui; import java.io.File; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICElement; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspaceRoot; @@ -27,9 +29,6 @@ import org.eclipse.ui.IElementFactory; import org.eclipse.ui.IMemento; import org.eclipse.ui.IPersistableElement; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICElement; - /** * The PersistableCElementFactory is used to save and recreate an ICElement object. * As such, it implements the IPersistableElement interface for storage diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ResourceAdapterFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ResourceAdapterFactory.java index 3281bb0fa2e..e7307d2604f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ResourceAdapterFactory.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ResourceAdapterFactory.java @@ -14,6 +14,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICElement; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; @@ -21,9 +23,6 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.runtime.IAdapterFactory; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICElement; - public class ResourceAdapterFactory implements IAdapterFactory { private static Class<?>[] PROPERTIES = new Class[] { ICElement.class }; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ResourceToCElementAdapterFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ResourceToCElementAdapterFactory.java index 7a875cb5d9e..014c14eaf93 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ResourceToCElementAdapterFactory.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ResourceToCElementAdapterFactory.java @@ -11,11 +11,10 @@ package org.eclipse.cdt.internal.ui; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.IAdapterFactory; - import org.eclipse.cdt.core.model.CoreModelUtil; import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.IAdapterFactory; /** * An adapter factory that adapts resources to CElements. This was introduced in diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AbstractUpdateIndexAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AbstractUpdateIndexAction.java index ef6179ffe2a..96165fb0f5c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AbstractUpdateIndexAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AbstractUpdateIndexAction.java @@ -17,6 +17,12 @@ package org.eclipse.cdt.internal.ui.actions; import java.util.ArrayList; import java.util.Iterator; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.index.IIndexManager; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; @@ -27,14 +33,6 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.index.IIndexManager; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.util.EditorUtility; - public abstract class AbstractUpdateIndexAction implements IObjectActionDelegate { private ISelection fSelection; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AbstractUpdateIndexHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AbstractUpdateIndexHandler.java index 3ee28358856..95cea07a3cd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AbstractUpdateIndexHandler.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AbstractUpdateIndexHandler.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.actions; +import org.eclipse.cdt.internal.ui.util.SelectionUtil; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; @@ -20,8 +21,6 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.handlers.HandlerUtil; -import org.eclipse.cdt.internal.ui.util.SelectionUtil; - /** * Abstract handler for {@link org.eclipse.cdt.internal.ui.actions.AbstractUpdateIndexAction} */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ActionUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ActionUtil.java index 7627308fa7d..ef1dc9d3952 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ActionUtil.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ActionUtil.java @@ -14,6 +14,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.actions; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.internal.corext.util.Messages; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.viewsupport.BasicElementLabels; import org.eclipse.core.resources.IResource; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; @@ -23,13 +27,6 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.editors.text.EditorsUI; import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants; -import org.eclipse.cdt.core.model.ICElement; - -import org.eclipse.cdt.internal.corext.util.Messages; - -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.viewsupport.BasicElementLabels; - /* * http://dev.eclipse.org/bugs/show_bug.cgi?id=19104 */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AddBlockCommentAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AddBlockCommentAction.java index a4fdf5de1cf..be397742b37 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AddBlockCommentAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AddBlockCommentAction.java @@ -19,6 +19,7 @@ import java.util.LinkedList; import java.util.List; import java.util.ResourceBundle; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.BadPartitioningException; import org.eclipse.jface.text.IDocument; @@ -29,8 +30,6 @@ import org.eclipse.jface.text.ITypedRegion; import org.eclipse.jface.text.Region; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.ui.text.ICPartitions; - /** * Action that encloses the editor's current selection with C block comment terminators * (<code>/*</code> and <code>*/</code>). diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AlignConstAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AlignConstAction.java index dcf41ce8bf4..c8fa162cadb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AlignConstAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AlignConstAction.java @@ -15,16 +15,6 @@ import java.util.ArrayList; import java.util.List; import java.util.ResourceBundle; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.text.TextSelection; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.ui.texteditor.TextEditorAction; - import org.eclipse.cdt.core.CCorePreferenceConstants; import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier; @@ -34,10 +24,18 @@ import org.eclipse.cdt.core.dom.rewrite.ASTRewrite; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.parser.Keywords; +import org.eclipse.cdt.internal.ui.refactoring.utils.IdentifierHelper; import org.eclipse.cdt.ui.CDTUITools; import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.refactoring.utils.IdentifierHelper; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.jface.text.TextSelection; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.ISelectionProvider; +import org.eclipse.ui.texteditor.ITextEditor; +import org.eclipse.ui.texteditor.TextEditorAction; public class AlignConstAction extends TextEditorAction { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CDTQuickMenuCreator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CDTQuickMenuCreator.java index a39fd3d7b53..f65c6964e66 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CDTQuickMenuCreator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CDTQuickMenuCreator.java @@ -14,6 +14,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.actions; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.text.CWordFinder; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; @@ -27,9 +29,6 @@ import org.eclipse.swt.custom.StyledText; import org.eclipse.swt.graphics.Point; import org.eclipse.ui.actions.QuickMenuCreator; -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.text.CWordFinder; - /** * C/C++ editor aware quick menu creator. In the given editor, the menu will be aligned with the word * at the current offset. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CollapseAllAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CollapseAllAction.java index 5a3285b074b..f0f29f30314 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CollapseAllAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CollapseAllAction.java @@ -13,13 +13,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.actions; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; import org.eclipse.jface.action.Action; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; - /** * Collapse all nodes. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CompositeActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CompositeActionGroup.java index b91be4e06d9..60a222c50f3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CompositeActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CompositeActionGroup.java @@ -13,9 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.actions; -import org.eclipse.jface.action.IMenuManager; import org.eclipse.core.runtime.Assert; - +import org.eclipse.jface.action.IMenuManager; import org.eclipse.ui.IActionBars; import org.eclipse.ui.actions.ActionContext; import org.eclipse.ui.actions.ActionGroup; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CopyTreeAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CopyTreeAction.java index 831d3fe2468..6640828231f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CopyTreeAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CopyTreeAction.java @@ -20,6 +20,7 @@ import java.io.PrintWriter; import java.io.StringReader; import java.io.StringWriter; +import org.eclipse.cdt.internal.ui.util.SelectionUtil; import org.eclipse.jface.action.Action; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ISelection; @@ -34,8 +35,6 @@ import org.eclipse.swt.dnd.Transfer; import org.eclipse.swt.widgets.TreeItem; import org.eclipse.ui.part.ViewPart; -import org.eclipse.cdt.internal.ui.util.SelectionUtil; - /** * Copies contents of a TreeViewer to the clipboard. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CreateParserLogAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CreateParserLogAction.java index 7939e729ad1..1dd57c36422 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CreateParserLogAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CreateParserLogAction.java @@ -30,32 +30,6 @@ import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; -import org.eclipse.core.filesystem.EFS; -import org.eclipse.core.filesystem.URIUtil; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.osgi.util.NLS; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.FileDialog; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IEditorReference; -import org.eclipse.ui.IObjectActionDelegate; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.IWorkbenchPartSite; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.ide.IDE; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.ILinkage; import org.eclipse.cdt.core.dom.ast.ASTVisitor; @@ -84,18 +58,41 @@ import org.eclipse.cdt.core.parser.ISignificantMacros; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.core.settings.model.ICProjectDescription; import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager; -import org.eclipse.cdt.ui.CDTUITools; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.IWorkingCopyManager; - import org.eclipse.cdt.internal.core.model.ASTCache; import org.eclipse.cdt.internal.core.model.TranslationUnit; import org.eclipse.cdt.internal.core.pdom.ASTFilePathResolver; import org.eclipse.cdt.internal.core.pdom.PDOM; import org.eclipse.cdt.internal.core.pdom.indexer.ProjectIndexerInputAdapter; - import org.eclipse.cdt.internal.ui.editor.ASTProvider; import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.ui.CDTUITools; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.IWorkingCopyManager; +import org.eclipse.core.filesystem.EFS; +import org.eclipse.core.filesystem.URIUtil; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.osgi.util.NLS; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.FileDialog; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IEditorReference; +import org.eclipse.ui.IObjectActionDelegate; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchPart; +import org.eclipse.ui.IWorkbenchPartSite; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.ide.IDE; @SuppressWarnings("nls") public class CreateParserLogAction implements IObjectActionDelegate { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CreateParserLogHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CreateParserLogHandler.java index 3abf5e3d82b..4bb2be64060 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CreateParserLogHandler.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CreateParserLogHandler.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.actions; +import org.eclipse.cdt.internal.ui.util.SelectionUtil; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; @@ -20,8 +21,6 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.handlers.HandlerUtil; -import org.eclipse.cdt.internal.ui.util.SelectionUtil; - /** * Handler for {@link org.eclipse.cdt.internal.ui.actions.CreateParserLogAction} * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/DeleteResConfigsHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/DeleteResConfigsHandler.java index 84a1c101e14..0cff564ebfe 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/DeleteResConfigsHandler.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/DeleteResConfigsHandler.java @@ -19,6 +19,15 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICContainer; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.core.settings.model.ICResourceDescription; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.newui.AbstractPage; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; @@ -43,16 +52,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.ListSelectionDialog; import org.eclipse.ui.handlers.HandlerUtil; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICContainer; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.core.settings.model.ICResourceDescription; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.newui.AbstractPage; - /** * Handler for command that deletes resource description. (If resource description is missing * one from parent is normally used) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ExcludeFromBuildHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ExcludeFromBuildHandler.java index c13fc9b3ca9..19923aa1a4d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ExcludeFromBuildHandler.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ExcludeFromBuildHandler.java @@ -19,6 +19,19 @@ import java.util.Arrays; import java.util.Collections; import java.util.Iterator; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICContainer; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.model.util.CDTListComparator; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.core.settings.model.ICSourceEntry; +import org.eclipse.cdt.core.settings.model.util.CDataUtil; +import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.newui.AbstractPage; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; @@ -44,21 +57,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.ListSelectionDialog; import org.eclipse.ui.handlers.HandlerUtil; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICContainer; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.model.util.CDTListComparator; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.core.settings.model.ICSourceEntry; -import org.eclipse.cdt.core.settings.model.util.CDataUtil; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.newui.AbstractPage; - -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * Handler for command that excludes resources from build. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ExpandAllAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ExpandAllAction.java index a6502d60f49..97bd1615ea3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ExpandAllAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ExpandAllAction.java @@ -13,13 +13,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.actions; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; import org.eclipse.jface.action.Action; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; - /** * Expand all nodes. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FindWordAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FindWordAction.java index 7af02b8306f..d2f03279d26 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FindWordAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FindWordAction.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.internal.ui.actions; import java.util.ResourceBundle; +import org.eclipse.cdt.internal.ui.text.CWordFinder; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.jface.text.IDocument; @@ -28,8 +29,6 @@ import org.eclipse.ui.texteditor.IDocumentProvider; import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.TextEditorAction; -import org.eclipse.cdt.internal.ui.text.CWordFinder; - /** * Select the word at current cursor location and find the next occurrence. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FoldingActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FoldingActionGroup.java index da687c9de3c..84c98e1e396 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FoldingActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FoldingActionGroup.java @@ -16,6 +16,7 @@ package org.eclipse.cdt.internal.ui.actions; import java.util.ResourceBundle; +import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.text.ITextViewer; @@ -28,8 +29,6 @@ import org.eclipse.ui.texteditor.IUpdate; import org.eclipse.ui.texteditor.ResourceAction; import org.eclipse.ui.texteditor.TextOperationAction; -import org.eclipse.cdt.internal.ui.editor.CEditor; - /** * Groups the CDT folding actions. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FoldingMessages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FoldingMessages.java index eedb6d0d0a9..a88fa49f62f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FoldingMessages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FoldingMessages.java @@ -13,10 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.actions; -import com.ibm.icu.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; +import com.ibm.icu.text.MessageFormat; + /** * Class that gives access to the folding messages resource bundle. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/GoToNextPreviousMemberAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/GoToNextPreviousMemberAction.java index 6e919fb7283..19eadaba6c8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/GoToNextPreviousMemberAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/GoToNextPreviousMemberAction.java @@ -18,20 +18,18 @@ package org.eclipse.cdt.internal.ui.actions; import java.util.ResourceBundle; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.ui.texteditor.TextEditorAction; - import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.IParent; import org.eclipse.cdt.core.model.ISourceRange; import org.eclipse.cdt.core.model.ISourceReference; import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.texteditor.ITextEditor; +import org.eclipse.ui.texteditor.TextEditorAction; /** * Gives possibility to move fast between member elements of the c/c++ source. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/IndentAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/IndentAction.java index d9c659f9255..26b8ba5fcdb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/IndentAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/IndentAction.java @@ -17,6 +17,17 @@ package org.eclipse.cdt.internal.ui.actions; import java.util.ResourceBundle; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.internal.corext.util.CodeFormatterUtil; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.editor.IndentUtil; +import org.eclipse.cdt.internal.ui.text.CHeuristicScanner; +import org.eclipse.cdt.internal.ui.text.CIndenter; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -40,20 +51,6 @@ import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.ITextEditorExtension3; import org.eclipse.ui.texteditor.TextEditorAction; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.ICPartitions; - -import org.eclipse.cdt.internal.corext.util.CodeFormatterUtil; - -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.editor.IndentUtil; -import org.eclipse.cdt.internal.ui.text.CHeuristicScanner; -import org.eclipse.cdt.internal.ui.text.CIndenter; -import org.eclipse.cdt.internal.ui.util.EditorUtility; - /** * Indents a line or range of lines in a C document to its correct position. No complete * AST must be present, the indentation is computed using heuristics. The algorithm used is fast for diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/OpenActionUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/OpenActionUtil.java index 3082149131e..9ec5d1fe7bd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/OpenActionUtil.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/OpenActionUtil.java @@ -18,6 +18,15 @@ package org.eclipse.cdt.internal.ui.actions; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ISourceReference; +import org.eclipse.cdt.internal.ui.dialogs.ElementListSelectionDialog; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; +import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider; +import org.eclipse.cdt.ui.CElementLabelProvider; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.IPath; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.viewers.ILabelProvider; @@ -27,17 +36,6 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PartInitException; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ISourceReference; -import org.eclipse.cdt.ui.CElementLabelProvider; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.dialogs.ElementListSelectionDialog; -import org.eclipse.cdt.internal.ui.util.EditorUtility; -import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; -import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider; - public class OpenActionUtil { private static final String DIALOG_SETTINGS_SECTION_NAME = CUIPlugin.PLUGIN_ID diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/RemoveBlockCommentAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/RemoveBlockCommentAction.java index 4ea687f7818..e6809dce6b5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/RemoveBlockCommentAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/RemoveBlockCommentAction.java @@ -18,6 +18,7 @@ import java.util.LinkedList; import java.util.List; import java.util.ResourceBundle; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.BadPartitioningException; import org.eclipse.jface.text.IDocument; @@ -27,8 +28,6 @@ import org.eclipse.jface.text.ITextSelection; import org.eclipse.jface.text.ITypedRegion; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.ui.text.ICPartitions; - /** * Action that removes the enclosing comment marks from a C block comment. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectAllAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectAllAction.java index e05ca2cf28f..a1d8ef8b1cf 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectAllAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectAllAction.java @@ -14,11 +14,9 @@ package org.eclipse.cdt.internal.ui.actions; import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.actions.ActionMessages; -import org.eclipse.jface.action.Action; import org.eclipse.core.runtime.Assert; +import org.eclipse.jface.action.Action; import org.eclipse.jface.viewers.TableViewer; - import org.eclipse.ui.PlatformUI; /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectionConverter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectionConverter.java index e8239596c40..a9265f0cf00 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectionConverter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectionConverter.java @@ -19,6 +19,16 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ISourceRange; +import org.eclipse.cdt.core.model.ISourceReference; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.util.ExceptionHandler; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.IWorkingCopyManager; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.text.ITextSelection; @@ -31,18 +41,6 @@ import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ISourceRange; -import org.eclipse.cdt.core.model.ISourceReference; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.IWorkingCopyManager; - -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.util.ExceptionHandler; - public class SelectionConverter { /** * Converts the selection provided by the given part into a structured selection. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectEnclosingAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectEnclosingAction.java index dfc1f86c46d..1a45861a7d6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectEnclosingAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectEnclosingAction.java @@ -16,18 +16,15 @@ package org.eclipse.cdt.internal.ui.actions; import java.util.ResourceBundle; -import org.eclipse.ui.texteditor.ITextEditor; - import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTNodeSelector; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateDeclaration; import org.eclipse.cdt.core.model.ISourceRange; - import org.eclipse.cdt.internal.core.model.ext.SourceRange; - import org.eclipse.cdt.internal.ui.editor.SelectionHistory; +import org.eclipse.ui.texteditor.ITextEditor; public class StructureSelectEnclosingAction extends StructureSelectionAction { public static final String PREFIX = "StructureSelectEnclosing."; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectHistoryAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectHistoryAction.java index 7103c5551b2..6970b1f2473 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectHistoryAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectHistoryAction.java @@ -15,14 +15,11 @@ package org.eclipse.cdt.internal.ui.actions; import java.util.ResourceBundle; -import org.eclipse.ui.texteditor.ITextEditor; - import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.model.ISourceRange; - import org.eclipse.cdt.internal.core.model.ext.SourceRange; - import org.eclipse.cdt.internal.ui.editor.SelectionHistory; +import org.eclipse.ui.texteditor.ITextEditor; public class StructureSelectHistoryAction extends StructureSelectionAction { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectNextAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectNextAction.java index 5459a3bffda..92a760a3359 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectNextAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectNextAction.java @@ -15,16 +15,13 @@ package org.eclipse.cdt.internal.ui.actions; import java.util.ResourceBundle; -import org.eclipse.ui.texteditor.ITextEditor; - import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTNodeSelector; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.model.ISourceRange; - import org.eclipse.cdt.internal.core.model.ext.SourceRange; - import org.eclipse.cdt.internal.ui.editor.SelectionHistory; +import org.eclipse.ui.texteditor.ITextEditor; public class StructureSelectNextAction extends StructureSelectionAction { public static final String PREFIX = "StructureSelectNext."; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectPreviousAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectPreviousAction.java index bd31f07ab74..10901979455 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectPreviousAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectPreviousAction.java @@ -15,16 +15,13 @@ package org.eclipse.cdt.internal.ui.actions; import java.util.ResourceBundle; -import org.eclipse.ui.texteditor.ITextEditor; - import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTNodeSelector; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.model.ISourceRange; - import org.eclipse.cdt.internal.core.model.ext.SourceRange; - import org.eclipse.cdt.internal.ui.editor.SelectionHistory; +import org.eclipse.ui.texteditor.ITextEditor; public class StructureSelectPreviousAction extends StructureSelectionAction { public static final String PREFIX = "StructureSelectPrevious."; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectionAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectionAction.java index bdfdd85922e..6f12255e0c2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectionAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectionAction.java @@ -15,28 +15,25 @@ package org.eclipse.cdt.internal.ui.actions; import java.util.ResourceBundle; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.ui.texteditor.TextEditorAction; - import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.model.ISourceRange; import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CDTUITools; -import org.eclipse.cdt.ui.text.SharedASTJob; - import org.eclipse.cdt.internal.core.model.ext.SourceRange; - import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.cdt.internal.ui.editor.SelectionHistory; +import org.eclipse.cdt.ui.CDTUITools; +import org.eclipse.cdt.ui.text.SharedASTJob; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.texteditor.ITextEditor; +import org.eclipse.ui.texteditor.TextEditorAction; public abstract class StructureSelectionAction extends TextEditorAction { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SurroundWithActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SurroundWithActionGroup.java index 4f247cca77c..99d48519584 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SurroundWithActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SurroundWithActionGroup.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.actions; +import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; @@ -23,8 +24,6 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.ui.actions.ActionGroup; -import org.eclipse.cdt.internal.ui.editor.CEditor; - public class SurroundWithActionGroup extends ActionGroup { private CEditor fEditor; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SurroundWithTemplateMenuAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SurroundWithTemplateMenuAction.java index 461dce5a464..e13d376674e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SurroundWithTemplateMenuAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SurroundWithTemplateMenuAction.java @@ -17,6 +17,11 @@ package org.eclipse.cdt.internal.ui.actions; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.text.contentassist.CContentAssistInvocationContext; +import org.eclipse.cdt.internal.ui.text.contentassist.TemplateCompletionProposalComputer; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.ActionContributionItem; @@ -51,13 +56,6 @@ import org.eclipse.ui.IWorkbenchWindowPulldownDelegate2; import org.eclipse.ui.actions.QuickMenuCreator; import org.eclipse.ui.dialogs.PreferencesUtil; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.text.contentassist.CContentAssistInvocationContext; -import org.eclipse.cdt.internal.ui.text.contentassist.TemplateCompletionProposalComputer; - public class SurroundWithTemplateMenuAction implements IWorkbenchWindowPulldownDelegate2 { public static final String SURROUND_WITH_QUICK_MENU_ACTION_ID = "org.eclipse.cdt.ui.edit.text.c.surround.with.quickMenu"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/WorkbenchRunnableAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/WorkbenchRunnableAdapter.java index 3264a3c06a2..7f676485219 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/WorkbenchRunnableAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/WorkbenchRunnableAdapter.java @@ -15,6 +15,8 @@ package org.eclipse.cdt.internal.ui.actions; import java.lang.reflect.InvocationTargetException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.internal.ui.CUIStatus; import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; @@ -27,10 +29,6 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.operation.IThreadListener; -import org.eclipse.cdt.core.model.CoreModel; - -import org.eclipse.cdt.internal.ui.CUIStatus; - /** * An <code>IRunnableWithProgress</code> that adapts and <code>IWorkspaceRunnable</code> * so that is can be executed inside <code>IRunnableContext</code>. <code>OperationCanceledException</code> diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/build/BuildPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/build/BuildPreferencePage.java index 19155f9a216..af9293868aa 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/build/BuildPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/build/BuildPreferencePage.java @@ -17,6 +17,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.build; +import org.eclipse.cdt.core.resources.ACBuilder; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.preferences.PreferencesMessages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.preference.PreferencePage; @@ -34,12 +38,6 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.core.resources.ACBuilder; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.preferences.PreferencesMessages; - /** * The page for top-level build preferences */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/build/NewToolChainWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/build/NewToolChainWizard.java index d7a6f474b35..51d3ae27d44 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/build/NewToolChainWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/build/NewToolChainWizard.java @@ -10,9 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.build; -import org.eclipse.jface.wizard.Wizard; - import org.eclipse.cdt.internal.ui.CUIMessages; +import org.eclipse.jface.wizard.Wizard; public class NewToolChainWizard extends Wizard { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/build/NewToolChainWizardSelectionPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/build/NewToolChainWizardSelectionPage.java index 89e1264822c..0c6b8ccfd92 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/build/NewToolChainWizardSelectionPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/build/NewToolChainWizardSelectionPage.java @@ -10,6 +10,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.build; +import org.eclipse.cdt.internal.ui.CUIMessages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.build.ToolChainWizard; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtension; @@ -29,11 +32,6 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableItem; import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.build.ToolChainWizard; - -import org.eclipse.cdt.internal.ui.CUIMessages; - public class NewToolChainWizardSelectionPage extends WizardPage { private Table table; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsole.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsole.java index 3fe645a9543..b6d993d7509 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsole.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsole.java @@ -18,6 +18,9 @@ package org.eclipse.cdt.internal.ui.buildconsole; import java.net.URL; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.IBuildConsoleManager; import org.eclipse.core.resources.IProject; import org.eclipse.swt.graphics.Color; import org.eclipse.ui.console.AbstractConsole; @@ -25,10 +28,6 @@ import org.eclipse.ui.console.IConsoleConstants; import org.eclipse.ui.console.IConsoleView; import org.eclipse.ui.part.IPageBookViewPage; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.IBuildConsoleManager; - /** * CDT Build console. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleFactory.java index fb00b87b86e..f990634ec85 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleFactory.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleFactory.java @@ -13,10 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.buildconsole; -import org.eclipse.ui.console.IConsoleFactory; - import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.IBuildConsoleManager; +import org.eclipse.ui.console.IConsoleFactory; /** * A console factory to allow the user to open the build console diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java index 52661ce9a3f..6c9dd71ea5b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java @@ -21,6 +21,13 @@ import java.net.URL; import java.util.HashMap; import java.util.Map; +import org.eclipse.cdt.core.resources.IConsole; +import org.eclipse.cdt.internal.core.LocalProjectScope; +import org.eclipse.cdt.internal.ui.preferences.BuildConsolePreferencePage; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.IBuildConsoleEvent; +import org.eclipse.cdt.ui.IBuildConsoleListener; +import org.eclipse.cdt.ui.IBuildConsoleManager; import org.eclipse.core.filesystem.URIUtil; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -51,16 +58,6 @@ import org.eclipse.ui.console.IConsoleConstants; import org.eclipse.ui.console.IConsoleView; import org.osgi.service.prefs.Preferences; -import org.eclipse.cdt.core.resources.IConsole; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.IBuildConsoleEvent; -import org.eclipse.cdt.ui.IBuildConsoleListener; -import org.eclipse.cdt.ui.IBuildConsoleManager; - -import org.eclipse.cdt.internal.core.LocalProjectScope; - -import org.eclipse.cdt.internal.ui.preferences.BuildConsolePreferencePage; - public class BuildConsoleManager implements IBuildConsoleManager, IResourceChangeListener, IPropertyChangeListener { /*package*/ static final String PREF_QUALIFIER = CUIPlugin.PLUGIN_ID; public static final String KEY_KEEP_LOG = "keepLog"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java index 58030ef05b6..c2eb2c340a8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java @@ -24,6 +24,14 @@ import java.util.List; import java.util.Map; import java.util.ResourceBundle; +import org.eclipse.cdt.core.ProblemMarkerInfo; +import org.eclipse.cdt.core.model.ICModelMarker; +import org.eclipse.cdt.core.resources.IConsole; +import org.eclipse.cdt.internal.ui.preferences.BuildConsolePreferencePage; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.IBuildConsoleEvent; +import org.eclipse.cdt.ui.IBuildConsoleListener; +import org.eclipse.cdt.ui.IBuildConsoleManager; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IProject; @@ -87,16 +95,6 @@ import org.eclipse.ui.texteditor.FindReplaceAction; import org.eclipse.ui.texteditor.ITextEditorActionConstants; import org.eclipse.ui.texteditor.IUpdate; -import org.eclipse.cdt.core.ProblemMarkerInfo; -import org.eclipse.cdt.core.model.ICModelMarker; -import org.eclipse.cdt.core.resources.IConsole; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.IBuildConsoleEvent; -import org.eclipse.cdt.ui.IBuildConsoleListener; -import org.eclipse.cdt.ui.IBuildConsoleManager; - -import org.eclipse.cdt.internal.ui.preferences.BuildConsolePreferencePage; - public class BuildConsolePage extends Page implements ISelectionListener, IPropertyChangeListener, IBuildConsoleListener, ITextListener, IAdaptable { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartitioner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartitioner.java index 84b91073c2c..bcea084b0da 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartitioner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartitioner.java @@ -26,6 +26,13 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; +import org.eclipse.cdt.core.ConsoleOutputStream; +import org.eclipse.cdt.core.ProblemMarkerInfo; +import org.eclipse.cdt.core.resources.IConsole; +import org.eclipse.cdt.core.resources.ResourcesUtil; +import org.eclipse.cdt.internal.ui.buildconsole.BuildConsolePartitionerEditData.UpdateUIData; +import org.eclipse.cdt.internal.ui.preferences.BuildConsolePreferencePage; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.filesystem.EFS; import org.eclipse.core.filesystem.IFileStore; import org.eclipse.core.resources.IProject; @@ -43,15 +50,6 @@ import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.console.ConsolePlugin; -import org.eclipse.cdt.core.ConsoleOutputStream; -import org.eclipse.cdt.core.ProblemMarkerInfo; -import org.eclipse.cdt.core.resources.IConsole; -import org.eclipse.cdt.core.resources.ResourcesUtil; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.buildconsole.BuildConsolePartitionerEditData.UpdateUIData; -import org.eclipse.cdt.internal.ui.preferences.BuildConsolePreferencePage; - /* * XXX the wrap lines is way too slow to be usable on large {@link #fMaxLines} * (not sure limit, 500 seems ok, 10000 is a problem) Best idea may be to do the diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartitionerEditData.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartitionerEditData.java index d6f9fa6ea88..e7db7dc1b6c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartitionerEditData.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartitionerEditData.java @@ -20,11 +20,10 @@ import java.util.List; import java.util.Objects; import java.util.Set; +import org.eclipse.cdt.core.ProblemMarkerInfo; import org.eclipse.core.resources.IMarker; import org.eclipse.jface.text.ITypedRegion; -import org.eclipse.cdt.core.ProblemMarkerInfo; - public class BuildConsolePartitionerEditData { /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleViewer.java index 7b145962b56..205f713f1f9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleViewer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleViewer.java @@ -16,6 +16,7 @@ package org.eclipse.cdt.internal.ui.buildconsole; import java.util.List; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.DocumentEvent; import org.eclipse.jface.text.IDocument; @@ -35,8 +36,6 @@ import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.widgets.Composite; -import org.eclipse.cdt.ui.CUIPlugin; - public class BuildConsoleViewer extends TextViewer implements LineStyleListener, LineBackgroundListener, MouseTrackListener, MouseListener { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildOutputStream.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildOutputStream.java index 5c21a53a21c..2cc2ed83357 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildOutputStream.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildOutputStream.java @@ -20,7 +20,6 @@ import java.io.IOException; import org.eclipse.cdt.core.ConsoleOutputStream; import org.eclipse.cdt.core.ProblemMarkerInfo; - import org.eclipse.cdt.internal.core.IErrorMarkeredOutputStream; /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/CBuildConsole.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/CBuildConsole.java index ae087f04fd6..3a77c49c0f1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/CBuildConsole.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/CBuildConsole.java @@ -15,14 +15,13 @@ package org.eclipse.cdt.internal.ui.buildconsole; import java.net.URL; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.Assert; -import org.eclipse.core.runtime.CoreException; import org.eclipse.cdt.core.ConsoleOutputStream; +import org.eclipse.cdt.internal.core.ICConsole; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.IBuildConsoleManager; - -import org.eclipse.cdt.internal.core.ICConsole; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.Assert; +import org.eclipse.core.runtime.CoreException; /** * CDT console adaptor providing output streams. The adaptor provides means of diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleEvent.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleEvent.java index 792053961e3..3cfa8f83d56 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleEvent.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleEvent.java @@ -15,9 +15,8 @@ package org.eclipse.cdt.internal.ui.buildconsole; import java.util.EventObject; -import org.eclipse.core.resources.IProject; - import org.eclipse.cdt.ui.IBuildConsoleEvent; +import org.eclipse.core.resources.IProject; public class ConsoleEvent extends EventObject implements IBuildConsoleEvent { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/CopyBuildLogAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/CopyBuildLogAction.java index 2e024f9e8a8..a66c17f9695 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/CopyBuildLogAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/CopyBuildLogAction.java @@ -17,6 +17,11 @@ package org.eclipse.cdt.internal.ui.buildconsole; import java.net.URI; +import org.eclipse.cdt.core.resources.IConsole; +import org.eclipse.cdt.core.resources.ResourcesUtil; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.IBuildConsoleManager; import org.eclipse.core.filesystem.EFS; import org.eclipse.core.filesystem.IFileStore; import org.eclipse.core.filesystem.URIUtil; @@ -29,13 +34,6 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Shell; -import org.eclipse.cdt.core.resources.IConsole; -import org.eclipse.cdt.core.resources.ResourcesUtil; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.IBuildConsoleManager; - -import org.eclipse.cdt.internal.ui.CPluginImages; - /** * Action to copy build log from working file to a user selected file. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/DocumentMarkerManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/DocumentMarkerManager.java index 7911b42073a..f26bb770362 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/DocumentMarkerManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/DocumentMarkerManager.java @@ -14,9 +14,8 @@ package org.eclipse.cdt.internal.ui.buildconsole; -import org.eclipse.jface.text.ITypedRegion; - import org.eclipse.cdt.core.ProblemMarkerInfo; +import org.eclipse.jface.text.ITypedRegion; /** * Manages current position of highlighted error in BuildConsole diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/GlobalBuildConsoleManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/GlobalBuildConsoleManager.java index c057165ef19..6f526dd9221 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/GlobalBuildConsoleManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/GlobalBuildConsoleManager.java @@ -16,6 +16,9 @@ package org.eclipse.cdt.internal.ui.buildconsole; import java.net.URI; import java.net.URL; +import org.eclipse.cdt.core.resources.IConsole; +import org.eclipse.cdt.internal.ui.preferences.BuildConsolePreferencePage; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.filesystem.URIUtil; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IPath; @@ -27,11 +30,6 @@ import org.eclipse.jface.text.IDocument; import org.eclipse.ui.preferences.ScopedPreferenceStore; import org.osgi.service.prefs.Preferences; -import org.eclipse.cdt.core.resources.IConsole; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.preferences.BuildConsolePreferencePage; - /** * Build console manager managing the global CDT build console. * Singleton. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/MultiBuildConsoleAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/MultiBuildConsoleAdapter.java index 69584fc1339..42ac2028632 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/MultiBuildConsoleAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/MultiBuildConsoleAdapter.java @@ -15,14 +15,12 @@ package org.eclipse.cdt.internal.ui.buildconsole; import java.io.IOException; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; - import org.eclipse.cdt.core.ConsoleOutputStream; import org.eclipse.cdt.core.ProblemMarkerInfo; import org.eclipse.cdt.core.resources.IConsole; - import org.eclipse.cdt.internal.core.IErrorMarkeredOutputStream; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; /** * Adapter that wraps a project console and the global console to allow builders diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/NextErrorAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/NextErrorAction.java index 74d5e65dd00..0c5b0b141c8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/NextErrorAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/NextErrorAction.java @@ -14,9 +14,8 @@ package org.eclipse.cdt.internal.ui.buildconsole; -import org.eclipse.jface.action.Action; - import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.jface.action.Action; /** * Advance console document to the next error reported by compiler diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/PreviousErrorAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/PreviousErrorAction.java index 973242b4ac9..de301a35fe6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/PreviousErrorAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/PreviousErrorAction.java @@ -15,9 +15,8 @@ package org.eclipse.cdt.internal.ui.buildconsole; -import org.eclipse.jface.action.Action; - import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.jface.action.Action; /** * Retard console document to the previous error reported by compiler diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ShowErrorAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ShowErrorAction.java index 264fc099c3f..92b57a91993 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ShowErrorAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ShowErrorAction.java @@ -15,14 +15,13 @@ package org.eclipse.cdt.internal.ui.buildconsole; +import org.eclipse.cdt.core.resources.IConsole; +import org.eclipse.cdt.ui.IBuildConsoleManager; import org.eclipse.core.resources.IProject; import org.eclipse.jface.action.Action; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.core.resources.IConsole; -import org.eclipse.cdt.ui.IBuildConsoleManager; - /** * Set whether to show error in editor when moving to next/prev error in Build Console */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/WrapLinesAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/WrapLinesAction.java index 86dbacec26d..8d8c165dec5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/WrapLinesAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/WrapLinesAction.java @@ -13,13 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.buildconsole; +import org.eclipse.cdt.internal.ui.preferences.BuildConsolePreferencePage; +import org.eclipse.cdt.ui.CDTSharedImages; import org.eclipse.jface.action.Action; import org.eclipse.swt.custom.StyledText; -import org.eclipse.cdt.ui.CDTSharedImages; - -import org.eclipse.cdt.internal.ui.preferences.BuildConsolePreferencePage; - /** * Toggles word wrapping of the console */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CElementSet.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CElementSet.java index 2aca12762ea..321abffe14e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CElementSet.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CElementSet.java @@ -20,7 +20,6 @@ import java.util.LinkedHashSet; import java.util.Set; import org.eclipse.cdt.core.model.ICElement; - import org.eclipse.cdt.internal.ui.viewsupport.WorkingSetFilterUI; public class CElementSet { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java index 53bef61d515..cf3548aa8b2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java @@ -17,11 +17,6 @@ package org.eclipse.cdt.internal.ui.callhierarchy; import java.util.ArrayList; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.swt.widgets.Display; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IEnumerator; @@ -36,15 +31,17 @@ import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.IMethod; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.model.IVariable; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.ICHEContentProvider; -import org.eclipse.cdt.ui.ICHENode; - import org.eclipse.cdt.internal.corext.util.CModelUtil; - import org.eclipse.cdt.internal.ui.viewsupport.AsyncTreeContentProvider; import org.eclipse.cdt.internal.ui.viewsupport.IndexUI; import org.eclipse.cdt.internal.ui.viewsupport.WorkingSetFilterUI; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.ICHEContentProvider; +import org.eclipse.cdt.ui.ICHENode; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.swt.widgets.Display; /** * This is the content provider for the call hierarchy. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHDropTargetListener.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHDropTargetListener.java index f3446877c4e..dbac79e733b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHDropTargetListener.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHDropTargetListener.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.internal.ui.callhierarchy; import java.util.Iterator; +import org.eclipse.cdt.core.model.ICElement; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.util.LocalSelectionTransfer; import org.eclipse.jface.viewers.ISelection; @@ -24,8 +25,6 @@ import org.eclipse.swt.dnd.DropTargetEvent; import org.eclipse.swt.dnd.DropTargetListener; import org.eclipse.swt.widgets.Display; -import org.eclipse.cdt.core.model.ICElement; - public class CHDropTargetListener implements DropTargetListener { private CHViewPart fCallHierarchy; private ICElement fInput; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHEProviderSettings.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHEProviderSettings.java index 9a72c9ee2a2..d664e2204ac 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHEProviderSettings.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHEProviderSettings.java @@ -16,6 +16,7 @@ package org.eclipse.cdt.internal.ui.callhierarchy; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.ui.ICHEContentProvider; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtension; @@ -24,8 +25,6 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider; import org.eclipse.jface.viewers.IOpenListener; -import org.eclipse.cdt.ui.ICHEContentProvider; - /** * The Call Hierarchy Extension provider Settings * Responsible to load all available extensions for EXTENSION_POINT_ID diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryAction.java index 4df91219c46..45e9ac269f5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryAction.java @@ -14,13 +14,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.callhierarchy; -import org.eclipse.jface.action.Action; -import org.eclipse.jface.resource.ImageDescriptor; - import org.eclipse.cdt.core.model.ICElement; - import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ImageDescriptor; /** * Action used for the include browser forward / backward buttons diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryDropDownAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryDropDownAction.java index 6f786e1a093..7c26e24ca23 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryDropDownAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryDropDownAction.java @@ -14,6 +14,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.callhierarchy; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.internal.ui.CPluginImages; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.ActionContributionItem; import org.eclipse.jface.action.IMenuCreator; @@ -22,10 +24,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.MenuItem; -import org.eclipse.cdt.core.model.ICElement; - -import org.eclipse.cdt.internal.ui.CPluginImages; - public class CHHistoryDropDownAction extends Action implements IMenuCreator { public static class ClearHistoryAction extends Action { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryListAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryListAction.java index 18bc20e93d6..ed093e0ce40 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryListAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryListAction.java @@ -17,6 +17,14 @@ package org.eclipse.cdt.internal.ui.callhierarchy; import java.util.Arrays; import java.util.List; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; +import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.action.Action; import org.eclipse.jface.dialogs.StatusDialog; @@ -30,16 +38,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; -import org.eclipse.cdt.core.model.ICElement; - -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; -import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; - public class CHHistoryListAction extends Action { private class HistoryListDialog extends StatusDialog { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHLabelProvider.java index 7e90ad7c99c..ca548c5aa6b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHLabelProvider.java @@ -17,6 +17,14 @@ package org.eclipse.cdt.internal.ui.callhierarchy; import java.util.HashMap; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.internal.ui.viewsupport.AppearanceAwareLabelProvider; +import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; +import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; +import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider; +import org.eclipse.cdt.internal.ui.viewsupport.ImageImageDescriptor; +import org.eclipse.cdt.ui.CElementImageDescriptor; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider; import org.eclipse.jface.viewers.StyledCellLabelProvider; @@ -28,16 +36,6 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.widgets.Display; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.ui.CElementImageDescriptor; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.viewsupport.AppearanceAwareLabelProvider; -import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; -import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; -import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider; -import org.eclipse.cdt.internal.ui.viewsupport.ImageImageDescriptor; - public class CHLabelProvider extends AppearanceAwareLabelProvider { private final static long LABEL_OPTIONS_SIMPLE = CElementLabels.ALL_FULLY_QUALIFIED | CElementLabels.M_PARAMETER_TYPES | CElementLabels.M_APP_RETURNTYPE | CElementLabels.F_APP_TYPE_SIGNATURE diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHNode.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHNode.java index 6825bf38d49..aea54b5691e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHNode.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHNode.java @@ -18,13 +18,12 @@ import java.util.Collections; import java.util.List; import java.util.Objects; -import org.eclipse.core.runtime.IAdaptable; - import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.IEnumerator; import org.eclipse.cdt.core.model.IMacro; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.model.IVariableDeclaration; +import org.eclipse.core.runtime.IAdaptable; /** * Represents a node in the include browser diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHPinAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHPinAction.java index 3a2c94034b3..45303c32bea 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHPinAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHPinAction.java @@ -14,11 +14,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.callhierarchy; +import org.eclipse.cdt.internal.ui.CPluginImages; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; -import org.eclipse.cdt.internal.ui.CPluginImages; - public class CHPinAction extends Action { private CHViewPart fView; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHProviderManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHProviderManager.java index 1b3ac467425..501e3cff9f9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHProviderManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHProviderManager.java @@ -16,6 +16,8 @@ package org.eclipse.cdt.internal.ui.callhierarchy; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.extensions.ICallHierarchyProvider; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtension; @@ -24,9 +26,6 @@ import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; import org.eclipse.osgi.util.NLS; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.extensions.ICallHierarchyProvider; - /** * Maintains a list of extensions implementing the org.eclipse.cdt.ui.callHierarchyProviders * extension point. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHQueries.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHQueries.java index 45f4727faa4..1289e87087b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHQueries.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHQueries.java @@ -18,9 +18,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.ILinkage; import org.eclipse.cdt.core.dom.ast.IBinding; @@ -33,12 +30,12 @@ import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ISourceReference; import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.extensions.ICallHierarchyProvider; - import org.eclipse.cdt.internal.core.dom.parser.cpp.ClassTypeHelper; import org.eclipse.cdt.internal.core.model.ext.ICElementHandle; - import org.eclipse.cdt.internal.ui.viewsupport.IndexUI; +import org.eclipse.cdt.ui.extensions.ICallHierarchyProvider; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; /** * Access to high level queries in the index. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java index 04cc882454a..b960dd2125d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java @@ -17,6 +17,32 @@ package org.eclipse.cdt.internal.ui.callhierarchy; import java.util.Iterator; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.IFunction; +import org.eclipse.cdt.core.model.IMethod; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.core.util.TextUtil; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.IContextMenuConstants; +import org.eclipse.cdt.internal.ui.actions.CopyTreeAction; +import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds; +import org.eclipse.cdt.internal.ui.search.actions.SelectionSearchGroup; +import org.eclipse.cdt.internal.ui.util.Messages; +import org.eclipse.cdt.internal.ui.viewsupport.AdaptingSelectionProvider; +import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; +import org.eclipse.cdt.internal.ui.viewsupport.DecoratingCLabelProvider; +import org.eclipse.cdt.internal.ui.viewsupport.EditorOpener; +import org.eclipse.cdt.internal.ui.viewsupport.ExtendedTreeViewer; +import org.eclipse.cdt.internal.ui.viewsupport.IndexUI; +import org.eclipse.cdt.internal.ui.viewsupport.TreeNavigator; +import org.eclipse.cdt.internal.ui.viewsupport.WorkingSetFilterUI; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.ICHEContentProvider; +import org.eclipse.cdt.ui.actions.CdtActionConstants; +import org.eclipse.cdt.ui.actions.OpenViewActionGroup; +import org.eclipse.cdt.ui.refactoring.actions.CRefactoringActionGroup; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IMenuListener; @@ -71,35 +97,6 @@ import org.eclipse.ui.navigator.ICommonMenuConstants; import org.eclipse.ui.part.PageBook; import org.eclipse.ui.part.ViewPart; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.IFunction; -import org.eclipse.cdt.core.model.IMethod; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.ICHEContentProvider; -import org.eclipse.cdt.ui.actions.CdtActionConstants; -import org.eclipse.cdt.ui.actions.OpenViewActionGroup; -import org.eclipse.cdt.ui.refactoring.actions.CRefactoringActionGroup; - -import org.eclipse.cdt.internal.core.util.TextUtil; - -import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.IContextMenuConstants; -import org.eclipse.cdt.internal.ui.actions.CopyTreeAction; -import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds; -import org.eclipse.cdt.internal.ui.search.actions.SelectionSearchGroup; -import org.eclipse.cdt.internal.ui.util.Messages; -import org.eclipse.cdt.internal.ui.viewsupport.AdaptingSelectionProvider; -import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; -import org.eclipse.cdt.internal.ui.viewsupport.DecoratingCLabelProvider; -import org.eclipse.cdt.internal.ui.viewsupport.EditorOpener; -import org.eclipse.cdt.internal.ui.viewsupport.ExtendedTreeViewer; -import org.eclipse.cdt.internal.ui.viewsupport.IndexUI; -import org.eclipse.cdt.internal.ui.viewsupport.TreeNavigator; -import org.eclipse.cdt.internal.ui.viewsupport.WorkingSetFilterUI; - /** * The view part for the include browser. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CallHierarchyUI.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CallHierarchyUI.java index af189256e2a..3cae498e4e4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CallHierarchyUI.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CallHierarchyUI.java @@ -17,19 +17,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IViewReference; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.texteditor.ITextEditor; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.ast.DOMException; import org.eclipse.cdt.core.dom.ast.EScopeKind; @@ -51,16 +38,26 @@ import org.eclipse.cdt.core.index.IIndexName; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.core.model.ext.ICElementHandle; import org.eclipse.cdt.internal.corext.util.CModelUtil; - import org.eclipse.cdt.internal.ui.actions.OpenActionUtil; import org.eclipse.cdt.internal.ui.util.ExceptionHandler; import org.eclipse.cdt.internal.ui.util.StatusLineHandler; import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; import org.eclipse.cdt.internal.ui.viewsupport.IndexUI; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IViewReference; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.texteditor.ITextEditor; public class CallHierarchyUI { static final int INDEX_SEARCH_OPTION = IIndexManager.ADD_DEPENDENCIES | IIndexManager.ADD_DEPENDENT diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenCallHierarchyAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenCallHierarchyAction.java index 2e803cc863b..8d998decc33 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenCallHierarchyAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenCallHierarchyAction.java @@ -13,12 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.callhierarchy; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.ui.IWorkbenchSite; -import org.eclipse.ui.texteditor.ITextEditor; - import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.IEnumeration; import org.eclipse.cdt.core.model.IEnumerator; @@ -26,6 +20,11 @@ import org.eclipse.cdt.core.model.IFunctionDeclaration; import org.eclipse.cdt.core.model.IVariableDeclaration; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.actions.SelectionDispatchAction; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ui.IWorkbenchSite; +import org.eclipse.ui.texteditor.ITextEditor; public class OpenCallHierarchyAction extends SelectionDispatchAction { private ITextEditor fEditor; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenElementInCallHierarchyAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenElementInCallHierarchyAction.java index cbcbebb8a9f..e8941eef785 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenElementInCallHierarchyAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenElementInCallHierarchyAction.java @@ -13,6 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.callhierarchy; +import org.eclipse.cdt.core.browser.ITypeInfo; +import org.eclipse.cdt.core.browser.ITypeReference; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.internal.ui.browser.opentype.ElementSelectionDialog; import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; @@ -26,12 +30,6 @@ import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindowActionDelegate; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.core.browser.ITypeInfo; -import org.eclipse.cdt.core.browser.ITypeReference; -import org.eclipse.cdt.core.model.ICElement; - -import org.eclipse.cdt.internal.ui.browser.opentype.ElementSelectionDialog; - public class OpenElementInCallHierarchyAction implements IWorkbenchWindowActionDelegate { private static final int[] VISIBLE_TYPES = { ICElement.C_FUNCTION, ICElement.C_METHOD, ICElement.C_VARIABLE, ICElement.C_ENUMERATOR, ICElement.C_FUNCTION_DECLARATION, ICElement.C_METHOD_DECLARATION, diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/AbstractMergeViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/AbstractMergeViewer.java index b6cf81e7a42..022715a5502 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/AbstractMergeViewer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/AbstractMergeViewer.java @@ -15,6 +15,9 @@ package org.eclipse.cdt.internal.ui.compare; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.ICColorConstants; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.compare.CompareConfiguration; import org.eclipse.compare.contentmergeviewer.TextMergeViewer; import org.eclipse.jface.preference.IPreferenceStore; @@ -30,10 +33,6 @@ import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.texteditor.AbstractTextEditor; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.ICColorConstants; -import org.eclipse.cdt.ui.text.ICPartitions; - /** * Abstract implementation of a merge viewer. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/AsmMergeViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/AsmMergeViewer.java index 796c8103f4d..6eb513d0585 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/AsmMergeViewer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/AsmMergeViewer.java @@ -13,6 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.compare; +import org.eclipse.cdt.ui.CDTUITools; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.AsmSourceViewerConfiguration; +import org.eclipse.cdt.ui.text.ICPartitions; +import org.eclipse.cdt.ui.text.IColorManager; import org.eclipse.compare.CompareConfiguration; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.IDocumentPartitioner; @@ -20,12 +25,6 @@ import org.eclipse.jface.text.source.SourceViewerConfiguration; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.swt.widgets.Composite; -import org.eclipse.cdt.ui.CDTUITools; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.AsmSourceViewerConfiguration; -import org.eclipse.cdt.ui.text.ICPartitions; -import org.eclipse.cdt.ui.text.IColorManager; - /** * A merge viewer for assembly code. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CContentViewerCreator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CContentViewerCreator.java index c69466d8944..6c822399f4d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CContentViewerCreator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CContentViewerCreator.java @@ -14,13 +14,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.compare; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Composite; - import org.eclipse.compare.CompareConfiguration; import org.eclipse.compare.IViewerCreator; - import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Composite; /** * Required when creating a CMergeViewer from the plugin.xml file. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CMergeViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CMergeViewer.java index fe19f4e1105..5a8242d9823 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CMergeViewer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CMergeViewer.java @@ -15,6 +15,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.compare; +import org.eclipse.cdt.internal.ui.text.CTextTools; +import org.eclipse.cdt.internal.ui.text.doctools.DocCommentOwnerManager; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.CSourceViewerConfiguration; +import org.eclipse.cdt.ui.text.ICPartitions; +import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; import org.eclipse.compare.CompareConfiguration; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.IDocumentPartitioner; @@ -22,14 +28,6 @@ import org.eclipse.jface.text.source.SourceViewerConfiguration; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.swt.widgets.Composite; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.CSourceViewerConfiguration; -import org.eclipse.cdt.ui.text.ICPartitions; -import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; - -import org.eclipse.cdt.internal.ui.text.CTextTools; -import org.eclipse.cdt.internal.ui.text.doctools.DocCommentOwnerManager; - /** * A merge viewer for C/C++ code. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreator.java index 38117dd5405..a2ea944be20 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreator.java @@ -21,6 +21,20 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.dom.ast.gnu.cpp.GPPLanguage; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.parser.FileContent; +import org.eclipse.cdt.core.parser.IScannerInfo; +import org.eclipse.cdt.core.parser.IncludeFileContentProvider; +import org.eclipse.cdt.core.parser.ParserUtil; +import org.eclipse.cdt.core.parser.ScannerInfo; +import org.eclipse.cdt.internal.ui.text.doctools.DocCommentOwnerManager; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.ICPartitions; +import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; import org.eclipse.compare.IEncodedStreamContentAccessor; import org.eclipse.compare.ISharedDocumentAdapter; import org.eclipse.compare.IStreamContentAccessor; @@ -39,22 +53,6 @@ import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IDocumentPartitioner; import org.eclipse.jface.text.Position; -import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.ast.gnu.cpp.GPPLanguage; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.parser.FileContent; -import org.eclipse.cdt.core.parser.IScannerInfo; -import org.eclipse.cdt.core.parser.IncludeFileContentProvider; -import org.eclipse.cdt.core.parser.ParserUtil; -import org.eclipse.cdt.core.parser.ScannerInfo; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.ICPartitions; -import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; - -import org.eclipse.cdt.internal.ui.text.doctools.DocCommentOwnerManager; - /** * A structure creator for C/C++ translation units. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreatorVisitor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreatorVisitor.java index 133a77eb59f..df7c9abadb9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreatorVisitor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreatorVisitor.java @@ -16,10 +16,6 @@ package org.eclipse.cdt.internal.ui.compare; import java.util.Stack; -import org.eclipse.compare.structuremergeviewer.DocumentRangeNode; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.Position; - import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTASMDeclaration; import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; @@ -27,6 +23,7 @@ import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier; import org.eclipse.cdt.core.dom.ast.IASTDeclaration; import org.eclipse.cdt.core.dom.ast.IASTDeclarator; import org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier.IASTEnumerator; import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IASTFunctionDeclarator; import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition; @@ -38,7 +35,6 @@ import org.eclipse.cdt.core.dom.ast.IASTPreprocessorMacroDefinition; import org.eclipse.cdt.core.dom.ast.IASTProblemDeclaration; import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier.IASTEnumerator; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTExplicitTemplateInstantiation; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLinkageSpecification; @@ -50,11 +46,12 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUsingDeclaration; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUsingDirective; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTVisibilityLabel; import org.eclipse.cdt.core.model.ICElement; - import org.eclipse.cdt.internal.core.model.ASTStringUtil; import org.eclipse.cdt.internal.core.model.CoreModelMessages; - import org.eclipse.cdt.internal.ui.CUIMessages; +import org.eclipse.compare.structuremergeviewer.DocumentRangeNode; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.Position; /** * AST visitor to create compare structure. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/BuildGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/BuildGroup.java index ed6ec636e2e..53aa87cc984 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/BuildGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/BuildGroup.java @@ -20,6 +20,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.ICommand; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -43,8 +44,6 @@ import org.eclipse.ui.actions.BuildAction; import org.eclipse.ui.ide.IDEActionFactory; import org.eclipse.ui.ide.ResourceUtil; -import org.eclipse.cdt.ui.CUIPlugin; - /** * This is the action group for workspace actions such as Build */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java index 71fd53581c2..2ecd51348a0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java @@ -18,6 +18,41 @@ package org.eclipse.cdt.internal.ui.cview; import java.util.ArrayList; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.IArchive; +import org.eclipse.cdt.core.model.IArchiveContainer; +import org.eclipse.cdt.core.model.IBinary; +import org.eclipse.cdt.core.model.IBinaryContainer; +import org.eclipse.cdt.core.model.IBinaryModule; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICModel; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.IParent; +import org.eclipse.cdt.core.model.ISourceReference; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.actions.SelectionConverter; +import org.eclipse.cdt.internal.ui.dnd.CDTViewerDragAdapter; +import org.eclipse.cdt.internal.ui.dnd.DelegatingDropAdapter; +import org.eclipse.cdt.internal.ui.dnd.FileTransferDragAdapter; +import org.eclipse.cdt.internal.ui.dnd.FileTransferDropAdapter; +import org.eclipse.cdt.internal.ui.dnd.PluginTransferDropAdapter; +import org.eclipse.cdt.internal.ui.dnd.ResourceTransferDragAdapter; +import org.eclipse.cdt.internal.ui.dnd.ResourceTransferDropAdapter; +import org.eclipse.cdt.internal.ui.dnd.TransferDragSourceListener; +import org.eclipse.cdt.internal.ui.dnd.TransferDropTargetListener; +import org.eclipse.cdt.internal.ui.editor.ITranslationUnitEditorInput; +import org.eclipse.cdt.internal.ui.preferences.CPluginPreferencePage; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.internal.ui.util.ProblemTreeViewer; +import org.eclipse.cdt.internal.ui.util.RemoteTreeViewer; +import org.eclipse.cdt.internal.ui.viewsupport.AppearanceAwareLabelProvider; +import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; +import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider; +import org.eclipse.cdt.internal.ui.viewsupport.DecoratingCLabelProvider; +import org.eclipse.cdt.ui.CElementContentProvider; +import org.eclipse.cdt.ui.CElementSorter; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IPath; @@ -83,43 +118,6 @@ import org.eclipse.ui.part.ShowInContext; import org.eclipse.ui.part.ViewPart; import org.eclipse.ui.views.framelist.FrameList; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.IArchive; -import org.eclipse.cdt.core.model.IArchiveContainer; -import org.eclipse.cdt.core.model.IBinary; -import org.eclipse.cdt.core.model.IBinaryContainer; -import org.eclipse.cdt.core.model.IBinaryModule; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICModel; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.IParent; -import org.eclipse.cdt.core.model.ISourceReference; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CElementContentProvider; -import org.eclipse.cdt.ui.CElementSorter; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; - -import org.eclipse.cdt.internal.ui.actions.SelectionConverter; -import org.eclipse.cdt.internal.ui.dnd.CDTViewerDragAdapter; -import org.eclipse.cdt.internal.ui.dnd.DelegatingDropAdapter; -import org.eclipse.cdt.internal.ui.dnd.FileTransferDragAdapter; -import org.eclipse.cdt.internal.ui.dnd.FileTransferDropAdapter; -import org.eclipse.cdt.internal.ui.dnd.PluginTransferDropAdapter; -import org.eclipse.cdt.internal.ui.dnd.ResourceTransferDragAdapter; -import org.eclipse.cdt.internal.ui.dnd.ResourceTransferDropAdapter; -import org.eclipse.cdt.internal.ui.dnd.TransferDragSourceListener; -import org.eclipse.cdt.internal.ui.dnd.TransferDropTargetListener; -import org.eclipse.cdt.internal.ui.editor.ITranslationUnitEditorInput; -import org.eclipse.cdt.internal.ui.preferences.CPluginPreferencePage; -import org.eclipse.cdt.internal.ui.util.EditorUtility; -import org.eclipse.cdt.internal.ui.util.ProblemTreeViewer; -import org.eclipse.cdt.internal.ui.util.RemoteTreeViewer; -import org.eclipse.cdt.internal.ui.viewsupport.AppearanceAwareLabelProvider; -import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; -import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider; -import org.eclipse.cdt.internal.ui.viewsupport.DecoratingCLabelProvider; - /** * * CView diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewContentProvider.java index edc2d563db5..99c26431f88 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewContentProvider.java @@ -16,13 +16,6 @@ package org.eclipse.cdt.internal.ui.cview; import java.util.ArrayList; -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IPath; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.ui.IWorkbenchPartSite; - import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.IArchive; import org.eclipse.cdt.core.model.IArchiveContainer; @@ -32,10 +25,15 @@ import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.IIncludeReference; import org.eclipse.cdt.core.model.ILibraryReference; -import org.eclipse.cdt.ui.CElementContentProvider; - import org.eclipse.cdt.internal.ui.util.RemoteTreeContentManager; import org.eclipse.cdt.internal.ui.util.RemoteTreeViewer; +import org.eclipse.cdt.ui.CElementContentProvider; +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.IPath; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.ui.IWorkbenchPartSite; /** * CViewContentProvider diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewElementComparer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewElementComparer.java index 2c8fc3a8106..1cdf1d8d832 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewElementComparer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewElementComparer.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.cview; -import org.eclipse.jface.viewers.IElementComparer; - import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.jface.viewers.IElementComparer; public class CViewElementComparer implements IElementComparer { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java index 770ef1adab1..ab80af0e014 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java @@ -15,28 +15,25 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.cview; -import org.eclipse.core.filesystem.URIUtil; -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IPath; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.StyledString; -import org.eclipse.swt.graphics.Image; - import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.IIncludeReference; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.settings.model.ICSettingEntry; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CElementImageDescriptor; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.corext.util.Strings; - import org.eclipse.cdt.internal.ui.language.settings.providers.LanguageSettingsImages; import org.eclipse.cdt.internal.ui.viewsupport.AppearanceAwareLabelProvider; import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CElementImageDescriptor; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.filesystem.URIUtil; +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.IPath; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.viewers.StyledString; +import org.eclipse.swt.graphics.Image; /** * Label provider for "C/C++ Projects" view. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMoveAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMoveAction.java index c35d027ebf3..720708489e9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMoveAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMoveAction.java @@ -18,6 +18,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; @@ -30,8 +31,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.MoveProjectAction; import org.eclipse.ui.actions.MoveResourceAction; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; - /** * The ResourceNavigatorMoveAction is a resource move that aso updates the navigator * to show the result of the move. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewRenameAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewRenameAction.java index fc56e4b6153..19d0832d80d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewRenameAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewRenameAction.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.cview; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.runtime.IPath; @@ -26,8 +27,6 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.RenameResourceAction; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; - /** * The ResourceNavigatorRenameAction is the rename action used by the * ResourceNavigator that also allows updating after rename. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CopyAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CopyAction.java index 697f2794b60..81df97c75f5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CopyAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CopyAction.java @@ -17,6 +17,7 @@ package org.eclipse.cdt.internal.ui.cview; import java.util.Iterator; import java.util.List; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.Assert; @@ -34,8 +35,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.SelectionListenerAction; import org.eclipse.ui.part.ResourceTransfer; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; - /** * Standard action for copying the currently selected resources to the clipboard. * <p> diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/DefaultAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/DefaultAction.java index 19da1e832bf..3b81bc82120 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/DefaultAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/DefaultAction.java @@ -13,10 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.cview; -import org.eclipse.swt.widgets.MessageBox; -import org.eclipse.swt.widgets.Shell; import org.eclipse.jface.action.Action; import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.MessageBox; +import org.eclipse.swt.widgets.Shell; public class DefaultAction extends Action { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/IncludeRefContainer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/IncludeRefContainer.java index 85ac40ab451..df326c9d89f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/IncludeRefContainer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/IncludeRefContainer.java @@ -14,14 +14,13 @@ package org.eclipse.cdt.internal.ui.cview; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.ui.model.IWorkbenchAdapter; - import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.IIncludeReference; import org.eclipse.cdt.ui.CDTSharedImages; import org.eclipse.cdt.ui.CElementGrouping; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.ui.model.IWorkbenchAdapter; /** * IncludeRefContainer diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/IncludeReferenceProxy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/IncludeReferenceProxy.java index 8f18cde5506..c8bb32e9db4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/IncludeReferenceProxy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/IncludeReferenceProxy.java @@ -14,12 +14,11 @@ package org.eclipse.cdt.internal.ui.cview; -import org.eclipse.jface.resource.ImageDescriptor; - import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.IIncludeReference; import org.eclipse.cdt.ui.CDTSharedImages; import org.eclipse.cdt.ui.CElementGrouping; +import org.eclipse.jface.resource.ImageDescriptor; /** * @author User diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/LibraryRefContainer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/LibraryRefContainer.java index c0c50a0be19..9cfe9b92ae8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/LibraryRefContainer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/LibraryRefContainer.java @@ -16,16 +16,15 @@ package org.eclipse.cdt.internal.ui.cview; import java.util.ArrayList; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.IPath; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.ui.model.IWorkbenchAdapter; - import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ILibraryReference; import org.eclipse.cdt.ui.CDTSharedImages; import org.eclipse.cdt.ui.CElementGrouping; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.IPath; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.ui.model.IWorkbenchAdapter; /** * VirtualGrouping diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java index f33ba40e223..f943755670f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java @@ -15,6 +15,16 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.cview; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.IContextMenuConstants; +import org.eclipse.cdt.internal.ui.actions.CollapseAllAction; +import org.eclipse.cdt.internal.ui.actions.SelectionConverter; +import org.eclipse.cdt.internal.ui.editor.OpenIncludeAction; +import org.eclipse.cdt.internal.ui.search.actions.SelectionSearchGroup; +import org.eclipse.cdt.ui.actions.CustomFiltersActionGroup; +import org.eclipse.cdt.ui.actions.OpenViewActionGroup; +import org.eclipse.cdt.ui.refactoring.actions.CRefactoringActionGroup; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IAdaptable; @@ -41,18 +51,6 @@ import org.eclipse.ui.actions.NewWizardMenu; import org.eclipse.ui.actions.WorkingSetFilterActionGroup; import org.eclipse.ui.ide.IDEActionFactory; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.actions.CustomFiltersActionGroup; -import org.eclipse.cdt.ui.actions.OpenViewActionGroup; -import org.eclipse.cdt.ui.refactoring.actions.CRefactoringActionGroup; - -import org.eclipse.cdt.internal.ui.IContextMenuConstants; -import org.eclipse.cdt.internal.ui.actions.CollapseAllAction; -import org.eclipse.cdt.internal.ui.actions.SelectionConverter; -import org.eclipse.cdt.internal.ui.editor.OpenIncludeAction; -import org.eclipse.cdt.internal.ui.search.actions.SelectionSearchGroup; - /** * The main action group for the cview. This contains a few actions and several * subgroups. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenFileGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenFileGroup.java index 40be5537331..d581e5b15db 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenFileGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenFileGroup.java @@ -14,6 +14,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.cview; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ISourceReference; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.actions.SelectionConverter; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -30,14 +36,6 @@ import org.eclipse.ui.actions.OpenFileAction; import org.eclipse.ui.actions.OpenInNewWindowAction; import org.eclipse.ui.actions.OpenWithMenu; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ISourceReference; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.actions.SelectionConverter; -import org.eclipse.cdt.internal.ui.util.EditorUtility; - /** * This is the action group for the open actions. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenProjectGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenProjectGroup.java index e461ea7308a..3bb12430e95 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenProjectGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenProjectGroup.java @@ -16,6 +16,7 @@ package org.eclipse.cdt.internal.ui.cview; import java.util.Iterator; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceChangeEvent; @@ -33,8 +34,6 @@ import org.eclipse.ui.actions.OpenResourceAction; import org.eclipse.ui.actions.RefreshAction; import org.eclipse.ui.ide.IDEActionFactory; -import org.eclipse.cdt.ui.CUIPlugin; - /** * This is the action group for actions such as Refresh Local, and Open/Close * Project. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/PasteAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/PasteAction.java index 51ebeed9317..bbce06a646c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/PasteAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/PasteAction.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.internal.ui.cview; import java.util.List; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -31,8 +32,6 @@ import org.eclipse.ui.actions.CopyProjectOperation; import org.eclipse.ui.actions.SelectionListenerAction; import org.eclipse.ui.part.ResourceTransfer; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; - /** * Standard action for pasting resources on the clipboard to the selected resource's location. * <p> diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/RefactorActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/RefactorActionGroup.java index 89aa3ded53a..e926d10fa31 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/RefactorActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/RefactorActionGroup.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.cview; +import org.eclipse.cdt.internal.ui.actions.SelectionConverter; import org.eclipse.core.resources.IResource; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.viewers.IStructuredSelection; @@ -30,8 +31,6 @@ import org.eclipse.ui.actions.ActionFactory; import org.eclipse.ui.actions.DeleteResourceAction; import org.eclipse.ui.actions.TextActionHandler; -import org.eclipse.cdt.internal.ui.actions.SelectionConverter; - /** * This is the action group for refactor actions, * including global action handlers for copy, paste and delete. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDragAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDragAdapter.java index 73986e9958b..9699a5ad528 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDragAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDragAdapter.java @@ -16,14 +16,12 @@ package org.eclipse.cdt.internal.ui.cview; import java.util.Iterator; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.jface.viewers.IStructuredSelection; - import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ISourceReference; - import org.eclipse.cdt.internal.ui.dnd.BasicSelectionTransferDragAdapter; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.ISelectionProvider; +import org.eclipse.jface.viewers.IStructuredSelection; public class SelectionTransferDragAdapter extends BasicSelectionTransferDragAdapter { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDropAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDropAdapter.java index 01b868f686f..680df5dc04d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDropAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDropAdapter.java @@ -20,6 +20,14 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ISourceReference; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.dnd.CDTViewerDropAdapter; +import org.eclipse.cdt.internal.ui.dnd.TransferDropTargetListener; +import org.eclipse.cdt.internal.ui.util.ExceptionHandler; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableContext; @@ -33,16 +41,6 @@ import org.eclipse.swt.dnd.DropTargetEvent; import org.eclipse.swt.dnd.Transfer; import org.eclipse.swt.widgets.Shell; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ISourceReference; -import org.eclipse.cdt.core.model.ITranslationUnit; - -import org.eclipse.cdt.internal.ui.dnd.CDTViewerDropAdapter; -import org.eclipse.cdt.internal.ui.dnd.TransferDropTargetListener; -import org.eclipse.cdt.internal.ui.util.ExceptionHandler; - public class SelectionTransferDropAdapter extends CDTViewerDropAdapter implements TransferDropTargetListener { private List<?> fElements; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/FormattingScopeDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/FormattingScopeDialog.java index cb45d77aa40..1d7cb65cb7b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/FormattingScopeDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/FormattingScopeDialog.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.dialogs; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.jface.dialogs.StatusDialog; import org.eclipse.jface.layout.PixelConverter; import org.eclipse.jface.preference.IPreferenceStore; @@ -24,9 +26,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; - /** * Asks user how formatting of an empty selection should be interpreted. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/OptionalMessageDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/OptionalMessageDialog.java index 5dc29c8ca06..e3c4f9ecb6f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/OptionalMessageDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/OptionalMessageDialog.java @@ -14,6 +14,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.dialogs; +import org.eclipse.cdt.internal.ui.CUIMessages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.MessageDialog; @@ -28,10 +30,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.CUIMessages; - /** * This is a <code>MessageDialog</code> which allows the user * to choose that the dialog isn't shown again the next time. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/ResizableStatusDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/ResizableStatusDialog.java index e3a0e300e92..9559a81e46f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/ResizableStatusDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/ResizableStatusDialog.java @@ -13,14 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.dialogs; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.StatusDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.widgets.Shell; -import org.eclipse.cdt.ui.CUIPlugin; - /** * A resizable {@link StatusDialog} that preserves its dimensions between invocations. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/SelectionList.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/SelectionList.java index 1154a110f61..f6054525872 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/SelectionList.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/SelectionList.java @@ -18,6 +18,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.eclipse.cdt.internal.ui.util.StringMatcher; +import org.eclipse.cdt.internal.ui.util.TwoArrayQuickSort; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; @@ -34,9 +36,6 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.internal.ui.util.StringMatcher; -import org.eclipse.cdt.internal.ui.util.TwoArrayQuickSort; - /** * A selection widget that consists of a list and a text entry field. The list * of elements presented are limited to the pattern entered into the text entry diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusInfo.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusInfo.java index 2ca2701275b..bc41af665d9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusInfo.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusInfo.java @@ -14,9 +14,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.dialogs; -import org.eclipse.core.runtime.IStatus; - import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.runtime.IStatus; /** * A settable IStatus diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusTool.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusTool.java index 9732bcc9b29..a65bf755832 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusTool.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusTool.java @@ -14,7 +14,6 @@ package org.eclipse.cdt.internal.ui.dialogs; import org.eclipse.core.runtime.IStatus; - import org.eclipse.jface.dialogs.DialogPage; public class StatusTool { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusUtil.java index 4f2782ac379..684c60379e4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusUtil.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusUtil.java @@ -14,7 +14,6 @@ package org.eclipse.cdt.internal.ui.dialogs; import org.eclipse.core.runtime.IStatus; - import org.eclipse.jface.dialogs.DialogPage; import org.eclipse.jface.dialogs.IMessageProvider; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TextFieldNavigationHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TextFieldNavigationHandler.java index 8bf4a72d1ae..263f5e017e7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TextFieldNavigationHandler.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TextFieldNavigationHandler.java @@ -17,6 +17,8 @@ package org.eclipse.cdt.internal.ui.dialogs; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.internal.ui.text.CWordIterator; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.commands.Command; import org.eclipse.core.commands.CommandManager; import org.eclipse.core.commands.ParameterizedCommand; @@ -49,10 +51,6 @@ import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds; import com.ibm.icu.text.BreakIterator; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.text.CWordIterator; - /** * Support for camelCase-aware sub-word navigation in dialog fields. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/AbstractPathOptionBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/AbstractPathOptionBlock.java index 6f57f042db8..cf1af894ad4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/AbstractPathOptionBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/AbstractPathOptionBlock.java @@ -16,31 +16,29 @@ package org.eclipse.cdt.internal.ui.dialogs.cpaths; import java.util.ArrayList; import java.util.List; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Preferences; -import org.eclipse.core.runtime.SubProgressMonitor; - import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICModelStatus; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.IPathEntry; -import org.eclipse.cdt.ui.dialogs.ICOptionContainer; -import org.eclipse.cdt.ui.dialogs.ICOptionPage; -import org.eclipse.cdt.ui.dialogs.TabFolderOptionBlock; - import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; import org.eclipse.cdt.internal.ui.util.CoreUtility; +import org.eclipse.cdt.ui.dialogs.ICOptionContainer; +import org.eclipse.cdt.ui.dialogs.ICOptionPage; +import org.eclipse.cdt.ui.dialogs.TabFolderOptionBlock; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Preferences; +import org.eclipse.core.runtime.SubProgressMonitor; /** * Abstract block for C/C++ Project Paths page for 3.X projects. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElement.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElement.java index dacbff457cd..7dd7f2106d4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElement.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElement.java @@ -16,14 +16,6 @@ package org.eclipse.cdt.internal.ui.dialogs.cpaths; import java.util.ArrayList; import java.util.List; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; - import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICElement; @@ -39,6 +31,13 @@ import org.eclipse.cdt.core.model.IPathEntryContainer; import org.eclipse.cdt.core.model.IPathEntryContainerExtension; import org.eclipse.cdt.core.model.ISourceEntry; import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IWorkspaceRoot; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Status; public class CPElement { public static final String SOURCEATTACHMENT = "sourcepath"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementFilter.java index 4877f63136f..8a26200d3f5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementFilter.java @@ -16,11 +16,10 @@ package org.eclipse.cdt.internal.ui.dialogs.cpaths; import java.util.Arrays; import java.util.List; +import org.eclipse.cdt.core.model.IPathEntry; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; -import org.eclipse.cdt.core.model.IPathEntry; - /** * Viewer filter for archive selection dialogs. Archives are files with file extension '.so', '.dll' and '.a'. The filter is not * case sensitive. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java index 47ec66bd0a6..8001f1f9fa7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java @@ -14,6 +14,13 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.dialogs.cpaths; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.IPathEntry; +import org.eclipse.cdt.core.model.IPathEntryContainer; +import org.eclipse.cdt.internal.ui.util.ImageDescriptorRegistry; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; @@ -29,15 +36,6 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.ide.IDE; import org.eclipse.ui.model.IWorkbenchAdapter; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.IPathEntry; -import org.eclipse.cdt.core.model.IPathEntryContainer; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.util.ImageDescriptorRegistry; - class CPElementLabelProvider extends LabelProvider implements IColorProvider { private Color inDirect = new Color(Display.getDefault(), new RGB(170, 170, 170)); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementSorter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementSorter.java index 2b7493ffc16..dd37747eb48 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementSorter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementSorter.java @@ -16,12 +16,11 @@ package org.eclipse.cdt.internal.ui.dialogs.cpaths; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.core.model.IPathEntry; import org.eclipse.core.resources.IProject; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; -import org.eclipse.cdt.core.model.IPathEntry; - /** * @deprecated as of CDT 4.0. This class was used for property pages * for 3.X style projects. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPListImageDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPListImageDescriptor.java index d120a664d8d..92c4516ef51 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPListImageDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPListImageDescriptor.java @@ -13,13 +13,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.dialogs.cpaths; +import org.eclipse.cdt.internal.ui.CPluginImages; import org.eclipse.jface.resource.CompositeImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.graphics.ImageData; import org.eclipse.swt.graphics.Point; -import org.eclipse.cdt.internal.ui.CPluginImages; - public class CPListImageDescriptor extends CompositeImageDescriptor { /** Flag to render the waring adornment */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathBasePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathBasePage.java index 5558ad786e5..e770f2a0a62 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathBasePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathBasePage.java @@ -17,12 +17,11 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import org.eclipse.core.runtime.IPath; -import org.eclipse.jface.resource.ImageDescriptor; - import org.eclipse.cdt.core.model.CoreModelUtil; import org.eclipse.cdt.core.model.IPathEntry; import org.eclipse.cdt.ui.dialogs.AbstractCOptionPage; +import org.eclipse.core.runtime.IPath; +import org.eclipse.jface.resource.ImageDescriptor; /** * Abstract Option Page for C/C++ Project Paths page for 3.X projects. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDefaultPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDefaultPage.java index d8b13c29052..64e8036c30b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDefaultPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDefaultPage.java @@ -15,19 +15,10 @@ package org.eclipse.cdt.internal.ui.dialogs.cpaths; import java.util.ArrayList; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; - import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.IContainerEntry; import org.eclipse.cdt.core.model.IPathEntry; -import org.eclipse.cdt.ui.wizards.IPathEntryContainerPage; - import org.eclipse.cdt.internal.ui.CPluginImages; import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; import org.eclipse.cdt.internal.ui.wizards.NewElementWizardPage; @@ -35,6 +26,13 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringDialogField; +import org.eclipse.cdt.ui.wizards.IPathEntryContainerPage; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.Path; +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; public class CPathContainerDefaultPage extends NewElementWizardPage implements IPathEntryContainerPage { private StringDialogField fEntryField; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDescriptor.java index 571fa93766e..a7a7c3f2fff 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDescriptor.java @@ -17,6 +17,12 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.IContainerEntry; +import org.eclipse.cdt.core.model.IPathEntry; +import org.eclipse.cdt.internal.ui.util.CoreUtility; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.wizards.IPathEntryContainerPage; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtension; @@ -33,14 +39,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.osgi.framework.Bundle; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.IContainerEntry; -import org.eclipse.cdt.core.model.IPathEntry; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.wizards.IPathEntryContainerPage; - -import org.eclipse.cdt.internal.ui.util.CoreUtility; - public class CPathContainerDescriptor implements IContainerDescriptor { /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerEntryPage.java index 6f2af8f5c76..91bc6479c51 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerEntryPage.java @@ -17,6 +17,17 @@ package org.eclipse.cdt.internal.ui.dialogs.cpaths; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.IContainerEntry; +import org.eclipse.cdt.core.model.IPathEntry; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFolder; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; @@ -29,19 +40,6 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.widgets.Composite; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.IContainerEntry; -import org.eclipse.cdt.core.model.IPathEntry; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField; - /** * Path Containers tab for C/C++ Project Paths page for 3.X projects. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerSelectionPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerSelectionPage.java index 049482349a1..84ec67dde8c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerSelectionPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerSelectionPage.java @@ -15,6 +15,9 @@ package org.eclipse.cdt.internal.ui.dialogs.cpaths; import java.util.Arrays; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.internal.ui.viewsupport.ListContentProvider; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.viewers.DoubleClickEvent; @@ -31,11 +34,6 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.internal.ui.viewsupport.ListContentProvider; - public class CPathContainerSelectionPage extends WizardPage { private static final String DIALOGSTORE_SECTION = "CPathContainerSelectionPage"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerWizard.java index 24ed0484d79..302e78025a9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerWizard.java @@ -17,6 +17,12 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.IContainerEntry; +import org.eclipse.cdt.core.model.IPathEntry; +import org.eclipse.cdt.core.model.IProjectEntry; +import org.eclipse.cdt.internal.ui.util.ExceptionHandler; +import org.eclipse.cdt.ui.wizards.IPathEntryContainerPage; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.layout.PixelConverter; import org.eclipse.jface.wizard.IWizardPage; @@ -24,14 +30,6 @@ import org.eclipse.jface.wizard.Wizard; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.widgets.Shell; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.IContainerEntry; -import org.eclipse.cdt.core.model.IPathEntry; -import org.eclipse.cdt.core.model.IProjectEntry; -import org.eclipse.cdt.ui.wizards.IPathEntryContainerPage; - -import org.eclipse.cdt.internal.ui.util.ExceptionHandler; - public class CPathContainerWizard extends Wizard { private IContainerDescriptor fPageDesc; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathFilterPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathFilterPage.java index d0d970f1c9b..4f8235eea16 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathFilterPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathFilterPage.java @@ -17,6 +17,15 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.IPathEntry; +import org.eclipse.cdt.core.model.IPathEntryContainer; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.internal.ui.viewsupport.ListContentProvider; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.viewers.CheckStateChangedEvent; @@ -30,17 +39,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.IPathEntry; -import org.eclipse.cdt.core.model.IPathEntryContainer; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.internal.ui.viewsupport.ListContentProvider; - public class CPathFilterPage extends WizardPage { private final int[] fFilterType; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryBasePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryBasePage.java index e40be2184bc..6c53117e71c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryBasePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryBasePage.java @@ -15,9 +15,8 @@ package org.eclipse.cdt.internal.ui.dialogs.cpaths; import java.util.List; -import org.eclipse.jface.resource.ImageDescriptor; - import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.jface.resource.ImageDescriptor; /** * Abstract DialogPage for C/C++ Project Paths page for 3.X projects. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java index e0e6a5b3da7..cf17136734d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java @@ -17,6 +17,29 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.CoreModelUtil; +import org.eclipse.cdt.core.model.ICContainer; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.IContainerEntry; +import org.eclipse.cdt.core.model.IIncludeEntry; +import org.eclipse.cdt.core.model.IMacroEntry; +import org.eclipse.cdt.core.model.IPathEntry; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; +import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator; +import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CElementContentProvider; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -46,31 +69,6 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.dialogs.ElementTreeSelectionDialog; import org.eclipse.ui.model.WorkbenchLabelProvider; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.CoreModelUtil; -import org.eclipse.cdt.core.model.ICContainer; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.IContainerEntry; -import org.eclipse.cdt.core.model.IIncludeEntry; -import org.eclipse.cdt.core.model.IMacroEntry; -import org.eclipse.cdt.core.model.IPathEntry; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CElementContentProvider; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; -import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator; -import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField; - /** * DialogPage for C/C++ Project Paths page for 3.X projects. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java index 1cf26dc7bc7..9deedc2c957 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java @@ -17,6 +17,29 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.CoreModelUtil; +import org.eclipse.cdt.core.model.ICContainer; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.IContainerEntry; +import org.eclipse.cdt.core.model.IIncludeEntry; +import org.eclipse.cdt.core.model.IMacroEntry; +import org.eclipse.cdt.core.model.IPathEntry; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; +import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator; +import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CElementContentProvider; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -47,31 +70,6 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.dialogs.ElementTreeSelectionDialog; import org.eclipse.ui.model.WorkbenchLabelProvider; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.CoreModelUtil; -import org.eclipse.cdt.core.model.ICContainer; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.IContainerEntry; -import org.eclipse.cdt.core.model.IIncludeEntry; -import org.eclipse.cdt.core.model.IMacroEntry; -import org.eclipse.cdt.core.model.IPathEntry; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CElementContentProvider; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; -import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator; -import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField; - /** * DialogPage for C/C++ Project Paths page for 3.X projects. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathLibraryEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathLibraryEntryPage.java index 6d5a03da100..d2b834ff545 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathLibraryEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathLibraryEntryPage.java @@ -18,6 +18,20 @@ package org.eclipse.cdt.internal.ui.dialogs.cpaths; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.IContainerEntry; +import org.eclipse.cdt.core.model.ILibraryEntry; +import org.eclipse.cdt.core.model.IPathEntry; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IResource; @@ -42,22 +56,6 @@ import org.eclipse.ui.model.WorkbenchContentProvider; import org.eclipse.ui.model.WorkbenchLabelProvider; import org.eclipse.ui.views.navigator.ResourceComparator; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.IContainerEntry; -import org.eclipse.cdt.core.model.ILibraryEntry; -import org.eclipse.cdt.core.model.IPathEntry; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField; - /** * Libraries tab for C/C++ Project Paths page for 3.X projects. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOrderExportPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOrderExportPage.java index 8590c851a2b..df1dcfc5645 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOrderExportPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOrderExportPage.java @@ -15,6 +15,10 @@ package org.eclipse.cdt.internal.ui.dialogs.cpaths; import java.util.List; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; +import org.eclipse.cdt.ui.CDTSharedImages; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.layout.PixelConverter; @@ -23,12 +27,6 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; -import org.eclipse.cdt.ui.CDTSharedImages; - -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; - /** * Export tab for C/C++ Project Paths page for 3.X projects. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOutputEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOutputEntryPage.java index 9272c4e2437..fc8e9172890 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOutputEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOutputEntryPage.java @@ -20,6 +20,18 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.IPathEntry; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; @@ -46,20 +58,6 @@ import org.eclipse.ui.dialogs.NewFolderDialog; import org.eclipse.ui.model.BaseWorkbenchContentProvider; import org.eclipse.ui.model.WorkbenchLabelProvider; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.IPathEntry; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField; - /** * Output tab for C/C++ Project Paths page for 3.X projects. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathProjectsEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathProjectsEntryPage.java index b3df166b070..bf74026947d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathProjectsEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathProjectsEntryPage.java @@ -16,6 +16,17 @@ package org.eclipse.cdt.internal.ui.dialogs.cpaths; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICModel; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.IPathEntry; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.CheckedListDialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; @@ -28,19 +39,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.ide.IDE; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ICModel; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.IPathEntry; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.CheckedListDialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; - /** * Projects tab for C/C++ Project Paths page for 3.X projects. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathSourceEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathSourceEntryPage.java index 72b7a3e9d24..f7ee0ff0b08 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathSourceEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathSourceEntryPage.java @@ -19,6 +19,18 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.IPathEntry; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; @@ -45,20 +57,6 @@ import org.eclipse.ui.dialogs.NewFolderDialog; import org.eclipse.ui.model.BaseWorkbenchContentProvider; import org.eclipse.ui.model.WorkbenchLabelProvider; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.IPathEntry; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField; - /** * Source tab for C/C++ Project Paths page for 3.X projects. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathTabBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathTabBlock.java index 7753664c844..f4530a0c713 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathTabBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathTabBlock.java @@ -15,19 +15,17 @@ package org.eclipse.cdt.internal.ui.dialogs.cpaths; import java.util.List; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.osgi.util.NLS; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; - import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.IPathEntry; - import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.osgi.util.NLS; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; /** * Block for C/C++ Project Paths page for 3.X projects. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternDialog.java index b116951ee80..bc0c4bc7c14 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternDialog.java @@ -16,6 +16,16 @@ package org.eclipse.cdt.internal.ui.dialogs.cpaths; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator; +import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter; +import org.eclipse.cdt.internal.ui.util.ImageDescriptorRegistry; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; @@ -43,18 +53,6 @@ import org.eclipse.ui.model.WorkbenchContentProvider; import org.eclipse.ui.model.WorkbenchLabelProvider; import org.eclipse.ui.views.navigator.ResourceComparator; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator; -import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter; -import org.eclipse.cdt.internal.ui.util.ImageDescriptorRegistry; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; - public class ExclusionPatternDialog extends StatusDialog { private static class ExclusionPatternLabelProvider extends LabelProvider { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternEntryDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternEntryDialog.java index b12b90e02cf..f3a854c77cd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternEntryDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternEntryDialog.java @@ -15,6 +15,14 @@ package org.eclipse.cdt.internal.ui.dialogs.cpaths; import java.util.List; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator; +import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IStringButtonAdapter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringButtonDialogField; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; @@ -41,15 +49,6 @@ import org.eclipse.ui.model.WorkbenchContentProvider; import org.eclipse.ui.model.WorkbenchLabelProvider; import org.eclipse.ui.views.navigator.ResourceComparator; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator; -import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IStringButtonAdapter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringButtonDialogField; - public class ExclusionPatternEntryDialog extends StatusDialog { private StringButtonDialogField fExclusionPatternDialog; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/FolderSelectionDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/FolderSelectionDialog.java index 9aaf7670e34..df64264ed92 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/FolderSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/FolderSelectionDialog.java @@ -14,6 +14,7 @@ package org.eclipse.cdt.internal.ui.dialogs.cpaths; +import org.eclipse.cdt.internal.ui.util.SWTUtil; import org.eclipse.core.resources.IContainer; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ISelectionChangedListener; @@ -35,8 +36,6 @@ import org.eclipse.ui.dialogs.ElementTreeSelectionDialog; import org.eclipse.ui.dialogs.NewFolderDialog; import org.eclipse.ui.views.navigator.ResourceComparator; -import org.eclipse.cdt.internal.ui.util.SWTUtil; - /** * @deprecated as of CDT 4.0. This class was used for property pages * for 3.X style projects. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IContainerDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IContainerDescriptor.java index 99bf0eeecbc..9b1ae516ea1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IContainerDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IContainerDescriptor.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.dialogs.cpaths; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.swt.graphics.Image; - import org.eclipse.cdt.core.model.IPathEntry; import org.eclipse.cdt.ui.wizards.IPathEntryContainerPage; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.swt.graphics.Image; public interface IContainerDescriptor { public IPathEntryContainerPage createPage() throws CoreException; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java index 98e43da4df3..a91398506b4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java @@ -15,6 +15,17 @@ package org.eclipse.cdt.internal.ui.dialogs.cpaths; import java.lang.reflect.InvocationTargetException; +import org.eclipse.cdt.core.CProjectNature; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.resources.IPathEntryStore; +import org.eclipse.cdt.core.resources.IPathEntryStoreListener; +import org.eclipse.cdt.core.resources.PathEntryStoreChangedEvent; +import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; +import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; +import org.eclipse.cdt.internal.ui.util.ExceptionHandler; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; @@ -34,19 +45,6 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation; import org.eclipse.ui.dialogs.PropertyPage; -import org.eclipse.cdt.core.CProjectNature; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.resources.IPathEntryStore; -import org.eclipse.cdt.core.resources.IPathEntryStoreListener; -import org.eclipse.cdt.core.resources.PathEntryStoreChangedEvent; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; -import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; -import org.eclipse.cdt.internal.ui.util.ExceptionHandler; - /** * @noreference This class is not intended to be referenced by clients. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/MultipleFolderSelectionDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/MultipleFolderSelectionDialog.java index c89e3e41db9..6ce6ce1c3ac 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/MultipleFolderSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/MultipleFolderSelectionDialog.java @@ -19,6 +19,8 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.util.SWTUtil; import org.eclipse.core.resources.IContainer; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.viewers.CheckStateChangedEvent; @@ -46,9 +48,6 @@ import org.eclipse.ui.dialogs.NewFolderDialog; import org.eclipse.ui.dialogs.SelectionStatusDialog; import org.eclipse.ui.views.navigator.ResourceComparator; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.util.SWTUtil; - /** * @deprecated as of CDT 4.0. This class was used for property pages * for 3.X style projects. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewIncludesSymbolsTabBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewIncludesSymbolsTabBlock.java index e7712ae153f..a810c452eaf 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewIncludesSymbolsTabBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewIncludesSymbolsTabBlock.java @@ -15,6 +15,11 @@ package org.eclipse.cdt.internal.ui.dialogs.cpaths; import java.util.List; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.IPathEntry; +import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; +import org.eclipse.cdt.ui.dialogs.ICOptionPage; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.swt.SWT; @@ -22,13 +27,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.IPathEntry; -import org.eclipse.cdt.ui.dialogs.ICOptionPage; - -import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; - /** * Block for C/C++ Include Paths and Symbols page for 3.X projects. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewSourceFolderDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewSourceFolderDialog.java index e5bb587caa0..76b0328510a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewSourceFolderDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewSourceFolderDialog.java @@ -15,6 +15,11 @@ package org.eclipse.cdt.internal.ui.dialogs.cpaths; import java.util.List; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringDialogField; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -30,12 +35,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringDialogField; - /** * @deprecated as of CDT 4.0. This class was used for property pages * for 3.X style projects. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerDescriptor.java index eabfae4ff9f..3b187b6566b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerDescriptor.java @@ -13,13 +13,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.dialogs.cpaths; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.swt.graphics.Image; -import org.eclipse.ui.ide.IDE; - import org.eclipse.cdt.core.model.IPathEntry; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.wizards.IPathEntryContainerPage; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.swt.graphics.Image; +import org.eclipse.ui.ide.IDE; public class ProjectContainerDescriptor implements IContainerDescriptor { private int[] fFilterType; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerPage.java index 8679b6ec63e..30e670affd6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerPage.java @@ -17,6 +17,15 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.IContainerEntry; +import org.eclipse.cdt.core.model.IPathEntry; +import org.eclipse.cdt.core.model.IProjectEntry; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.internal.ui.viewsupport.ListContentProvider; +import org.eclipse.cdt.ui.wizards.IPathEntryContainerPage; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; @@ -33,17 +42,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.ui.model.WorkbenchLabelProvider; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.IContainerEntry; -import org.eclipse.cdt.core.model.IPathEntry; -import org.eclipse.cdt.core.model.IProjectEntry; -import org.eclipse.cdt.ui.wizards.IPathEntryContainerPage; - -import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.internal.ui.viewsupport.ListContentProvider; - public class ProjectContainerPage extends WizardPage implements IPathEntryContainerPage { private int[] fFilterType; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentBlock.java index 90ab6904cc8..f5ca91dca82 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentBlock.java @@ -18,6 +18,22 @@ import java.io.File; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ILibraryEntry; +import org.eclipse.cdt.core.model.IPathEntry; +import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; +import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IStringButtonAdapter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringButtonDialogField; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IResource; @@ -51,24 +67,6 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.model.WorkbenchContentProvider; import org.eclipse.ui.model.WorkbenchLabelProvider; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ILibraryEntry; -import org.eclipse.cdt.core.model.IPathEntry; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; -import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IStringButtonAdapter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringButtonDialogField; - /** * UI to set the source attachment archive and root. Same implementation for both setting attachments for libraries from variable * entries and for normal (internal or external) jar. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentDialog.java index f70df6e18a7..7e259d11494 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentDialog.java @@ -16,6 +16,12 @@ package org.eclipse.cdt.internal.ui.dialogs.cpaths; import java.lang.reflect.InvocationTargetException; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ILibraryEntry; +import org.eclipse.cdt.core.model.IPathEntry; +import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; +import org.eclipse.cdt.internal.ui.util.ExceptionHandler; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.ProgressMonitorDialog; @@ -26,14 +32,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ILibraryEntry; -import org.eclipse.cdt.core.model.IPathEntry; - -import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; -import org.eclipse.cdt.internal.ui.util.ExceptionHandler; - /** * A dialog to configure the source attachment of a library (library and zip archive). * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/DelegatingDropAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/DelegatingDropAdapter.java index 5c819078459..19bbfc263d4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/DelegatingDropAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/DelegatingDropAdapter.java @@ -14,8 +14,8 @@ package org.eclipse.cdt.internal.ui.dnd; -import org.eclipse.core.runtime.SafeRunner; import org.eclipse.core.runtime.Assert; +import org.eclipse.core.runtime.SafeRunner; import org.eclipse.jface.util.SafeRunnable; import org.eclipse.swt.dnd.DND; import org.eclipse.swt.dnd.DropTargetEvent; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDragAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDragAdapter.java index 33f4e76c818..595a0568e06 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDragAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDragAdapter.java @@ -21,6 +21,9 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import org.eclipse.cdt.internal.ui.CUIMessages; +import org.eclipse.cdt.internal.ui.util.ExceptionHandler; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; @@ -44,11 +47,6 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.actions.WorkspaceModifyOperation; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.CUIMessages; -import org.eclipse.cdt.internal.ui.util.ExceptionHandler; - public class FileTransferDragAdapter implements TransferDragSourceListener { private final ISelectionProvider provider; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/PluginTransferDropAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/PluginTransferDropAdapter.java index 3ba98ff6862..d5beaa9cec6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/PluginTransferDropAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/PluginTransferDropAdapter.java @@ -14,6 +14,7 @@ package org.eclipse.cdt.internal.ui.dnd; +import org.eclipse.cdt.core.model.ICElement; import org.eclipse.core.resources.IResource; import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.swt.dnd.DropTargetEvent; @@ -21,8 +22,6 @@ import org.eclipse.swt.dnd.Transfer; import org.eclipse.ui.part.PluginDropAdapter; import org.eclipse.ui.part.PluginTransfer; -import org.eclipse.cdt.core.model.ICElement; - /** * PluginTransferDropAdapter * Enable DND to support PluginTransfer type. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDragAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDragAdapter.java index b75b0a843c8..eb2e572aa2f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDragAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDragAdapter.java @@ -18,6 +18,7 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; +import org.eclipse.cdt.internal.ui.CUIMessages; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; @@ -34,8 +35,6 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.actions.ReadOnlyStateChecker; import org.eclipse.ui.part.ResourceTransfer; -import org.eclipse.cdt.internal.ui.CUIMessages; - /** * A drag adapter that transfers the current selection as </code> * IResource</code>. Only those elements in the selection are part diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDropAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDropAdapter.java index 95d0d22fe46..9f06282b975 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDropAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDropAdapter.java @@ -18,6 +18,7 @@ package org.eclipse.cdt.internal.ui.dnd; import java.util.ArrayList; import java.util.Iterator; +import org.eclipse.cdt.core.model.ICElement; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IAdaptable; @@ -34,8 +35,6 @@ import org.eclipse.ui.actions.MoveFilesAndFoldersOperation; import org.eclipse.ui.actions.ReadOnlyStateChecker; import org.eclipse.ui.part.ResourceTransfer; -import org.eclipse.cdt.core.model.ICElement; - /** * ResourceTransferDropAdapter */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ASTProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ASTProvider.java index e6e7ccb508a..7675c553dc7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ASTProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ASTProvider.java @@ -16,6 +16,15 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.editor; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.model.ITranslationUnitHolder; +import org.eclipse.cdt.internal.core.model.ASTCache; +import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -32,17 +41,6 @@ import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.index.IIndex; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.model.ITranslationUnitHolder; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.core.model.ASTCache; -import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; - /** * Provides a shared AST for clients. The shared AST is * the AST of the active CEditor's input element. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java index 12adce81f9e..93d0ffcca12 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java @@ -17,6 +17,32 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.editor; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.IContextMenuConstants; +import org.eclipse.cdt.internal.ui.actions.AbstractToggleLinkingAction; +import org.eclipse.cdt.internal.ui.actions.ActionMessages; +import org.eclipse.cdt.internal.ui.actions.CollapseAllAction; +import org.eclipse.cdt.internal.ui.cview.SelectionTransferDragAdapter; +import org.eclipse.cdt.internal.ui.cview.SelectionTransferDropAdapter; +import org.eclipse.cdt.internal.ui.dnd.CDTViewerDragAdapter; +import org.eclipse.cdt.internal.ui.dnd.DelegatingDropAdapter; +import org.eclipse.cdt.internal.ui.dnd.TransferDragSourceListener; +import org.eclipse.cdt.internal.ui.dnd.TransferDropTargetListener; +import org.eclipse.cdt.internal.ui.search.actions.SelectionSearchGroup; +import org.eclipse.cdt.internal.ui.util.ProblemTreeViewer; +import org.eclipse.cdt.internal.ui.viewsupport.AppearanceAwareLabelProvider; +import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; +import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider; +import org.eclipse.cdt.internal.ui.viewsupport.DecoratingCLabelProvider; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.IncludesGrouping; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.actions.OpenViewActionGroup; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.ListenerList; import org.eclipse.jface.action.Action; @@ -64,34 +90,6 @@ import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds; import org.eclipse.ui.views.contentoutline.IContentOutlinePage; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.IncludesGrouping; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.actions.OpenViewActionGroup; - -import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.IContextMenuConstants; -import org.eclipse.cdt.internal.ui.actions.AbstractToggleLinkingAction; -import org.eclipse.cdt.internal.ui.actions.ActionMessages; -import org.eclipse.cdt.internal.ui.actions.CollapseAllAction; -import org.eclipse.cdt.internal.ui.cview.SelectionTransferDragAdapter; -import org.eclipse.cdt.internal.ui.cview.SelectionTransferDropAdapter; -import org.eclipse.cdt.internal.ui.dnd.CDTViewerDragAdapter; -import org.eclipse.cdt.internal.ui.dnd.DelegatingDropAdapter; -import org.eclipse.cdt.internal.ui.dnd.TransferDragSourceListener; -import org.eclipse.cdt.internal.ui.dnd.TransferDropTargetListener; -import org.eclipse.cdt.internal.ui.search.actions.SelectionSearchGroup; -import org.eclipse.cdt.internal.ui.util.ProblemTreeViewer; -import org.eclipse.cdt.internal.ui.viewsupport.AppearanceAwareLabelProvider; -import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; -import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider; -import org.eclipse.cdt.internal.ui.viewsupport.DecoratingCLabelProvider; - /** * Abstract outline page based on CModel. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeAction.java index 40cef9d6b36..7205c082c03 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeAction.java @@ -15,6 +15,17 @@ package org.eclipse.cdt.internal.ui.editor; import java.util.Collection; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.index.IIndexManager; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.core.model.ASTCache; +import org.eclipse.cdt.internal.ui.BusyCursorJobRunner; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.refactoring.includes.IElementSelector; +import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeCreator; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -39,20 +50,6 @@ import org.eclipse.ui.dialogs.ElementListSelectionDialog; import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.TextEditorAction; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.index.IIndex; -import org.eclipse.cdt.core.index.IIndexManager; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.core.model.ASTCache; - -import org.eclipse.cdt.internal.ui.BusyCursorJobRunner; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.refactoring.includes.IElementSelector; -import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeCreator; - /** * Adds an '#include' statement and, optionally, a 'using' declaration necessary to resolve a name. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java index 43c8e077802..4a8321ecf28 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java @@ -16,6 +16,17 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.editor; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.internal.ui.actions.ActionMessages; +import org.eclipse.cdt.internal.ui.search.actions.SelectionSearchGroup; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.actions.CustomFiltersActionGroup; +import org.eclipse.cdt.ui.actions.GenerateActionGroup; +import org.eclipse.cdt.ui.actions.MemberFilterActionGroup; +import org.eclipse.cdt.ui.actions.OpenViewActionGroup; +import org.eclipse.cdt.ui.refactoring.actions.CRefactoringActionGroup; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IMenuManager; import org.eclipse.swt.SWT; @@ -30,19 +41,6 @@ import org.eclipse.ui.IActionBars; import org.eclipse.ui.actions.ActionGroup; import org.eclipse.ui.dialogs.PreferencesUtil; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.actions.CustomFiltersActionGroup; -import org.eclipse.cdt.ui.actions.GenerateActionGroup; -import org.eclipse.cdt.ui.actions.MemberFilterActionGroup; -import org.eclipse.cdt.ui.actions.OpenViewActionGroup; -import org.eclipse.cdt.ui.refactoring.actions.CRefactoringActionGroup; - -import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.internal.ui.actions.ActionMessages; -import org.eclipse.cdt.internal.ui.search.actions.SelectionSearchGroup; - /** * Outline page for C/C++ translation units. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinerProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinerProvider.java index 81f5a690e2d..f1047ded1e7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinerProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinerProvider.java @@ -17,17 +17,6 @@ package org.eclipse.cdt.internal.ui.editor; import java.util.ArrayList; import java.util.Iterator; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.ui.IWorkbenchPartSite; -import org.eclipse.ui.progress.PendingUpdateAdapter; - import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ElementChangedEvent; @@ -36,12 +25,20 @@ import org.eclipse.cdt.core.model.ICElementDelta; import org.eclipse.cdt.core.model.IElementChangedListener; import org.eclipse.cdt.core.model.ISourceRange; import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.PreferenceConstants; - import org.eclipse.cdt.internal.core.model.CShiftData; import org.eclipse.cdt.internal.core.model.SourceManipulation; - import org.eclipse.cdt.internal.ui.BaseCElementContentProvider; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.jface.util.IPropertyChangeListener; +import org.eclipse.jface.util.PropertyChangeEvent; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.ui.IWorkbenchPartSite; +import org.eclipse.ui.progress.PendingUpdateAdapter; /** * Manages contents of the outliner. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java index a466c7b923f..f1de61a02cc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java @@ -22,6 +22,27 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import org.eclipse.cdt.core.ToolFactory; +import org.eclipse.cdt.core.dom.ast.IASTNode; +import org.eclipse.cdt.core.formatter.CodeFormatter; +import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICModelMarker; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.IProblemRequestor; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.cdt.core.parser.IPersistableProblem; +import org.eclipse.cdt.core.parser.IProblem; +import org.eclipse.cdt.internal.core.model.TranslationUnit; +import org.eclipse.cdt.internal.ui.saveactions.AlignConstSaveAction; +import org.eclipse.cdt.internal.ui.text.IProblemRequestorExtension; +import org.eclipse.cdt.internal.ui.text.spelling.CoreSpellingProblem; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.ui.CDTUITools; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.core.filebuffers.ITextFileBuffer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; @@ -73,30 +94,6 @@ import org.eclipse.ui.texteditor.MarkerUtilities; import org.eclipse.ui.texteditor.ResourceMarkerAnnotationModel; import org.eclipse.ui.texteditor.spelling.SpellingAnnotation; -import org.eclipse.cdt.core.ToolFactory; -import org.eclipse.cdt.core.dom.ast.IASTNode; -import org.eclipse.cdt.core.formatter.CodeFormatter; -import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICModelMarker; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.IProblemRequestor; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.core.parser.IPersistableProblem; -import org.eclipse.cdt.core.parser.IProblem; -import org.eclipse.cdt.ui.CDTUITools; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.ICPartitions; - -import org.eclipse.cdt.internal.core.model.TranslationUnit; - -import org.eclipse.cdt.internal.ui.saveactions.AlignConstSaveAction; -import org.eclipse.cdt.internal.ui.text.IProblemRequestorExtension; -import org.eclipse.cdt.internal.ui.text.spelling.CoreSpellingProblem; -import org.eclipse.cdt.internal.ui.util.EditorUtility; - /** * A document provider for C/C++ content. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentSetupParticipant.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentSetupParticipant.java index 9a84019639c..573d2a9c436 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentSetupParticipant.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentSetupParticipant.java @@ -15,16 +15,14 @@ package org.eclipse.cdt.internal.ui.editor; +import org.eclipse.cdt.internal.ui.text.CTextTools; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.filebuffers.IDocumentSetupParticipant; import org.eclipse.core.filebuffers.IDocumentSetupParticipantExtension; import org.eclipse.core.filebuffers.LocationKind; import org.eclipse.core.runtime.IPath; import org.eclipse.jface.text.IDocument; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.text.CTextTools; - /** * CDocumentSetupParticipant */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java index 2c528e49372..67fc913798a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java @@ -32,6 +32,75 @@ import java.util.Map; import java.util.ResourceBundle; import java.util.Set; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.CCorePreferenceConstants; +import org.eclipse.cdt.core.dom.ast.IASTName; +import org.eclipse.cdt.core.dom.ast.IASTNodeSelector; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.dom.ast.IBinding; +import org.eclipse.cdt.core.dom.ast.gnu.cpp.GPPLanguage; +import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.ISourceRange; +import org.eclipse.cdt.core.model.ISourceReference; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.model.ITranslationUnitHolder; +import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; +import org.eclipse.cdt.internal.corext.util.CodeFormatterUtil; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.IContextMenuConstants; +import org.eclipse.cdt.internal.ui.actions.AddBlockCommentAction; +import org.eclipse.cdt.internal.ui.actions.AlignConstAction; +import org.eclipse.cdt.internal.ui.actions.FindWordAction; +import org.eclipse.cdt.internal.ui.actions.FoldingActionGroup; +import org.eclipse.cdt.internal.ui.actions.GoToNextPreviousMemberAction; +import org.eclipse.cdt.internal.ui.actions.GotoNextBookmarkAction; +import org.eclipse.cdt.internal.ui.actions.IndentAction; +import org.eclipse.cdt.internal.ui.actions.RemoveBlockCommentAction; +import org.eclipse.cdt.internal.ui.actions.StructureSelectEnclosingAction; +import org.eclipse.cdt.internal.ui.actions.StructureSelectHistoryAction; +import org.eclipse.cdt.internal.ui.actions.StructureSelectNextAction; +import org.eclipse.cdt.internal.ui.actions.StructureSelectPreviousAction; +import org.eclipse.cdt.internal.ui.actions.StructureSelectionAction; +import org.eclipse.cdt.internal.ui.actions.SurroundWithActionGroup; +import org.eclipse.cdt.internal.ui.dialogs.FormattingScopeDialog; +import org.eclipse.cdt.internal.ui.search.IOccurrencesFinder; +import org.eclipse.cdt.internal.ui.search.IOccurrencesFinder.OccurrenceLocation; +import org.eclipse.cdt.internal.ui.search.OccurrencesFinder; +import org.eclipse.cdt.internal.ui.search.actions.SelectionSearchGroup; +import org.eclipse.cdt.internal.ui.text.CHeuristicScanner; +import org.eclipse.cdt.internal.ui.text.CPairMatcher; +import org.eclipse.cdt.internal.ui.text.CSourceViewerScalableConfiguration; +import org.eclipse.cdt.internal.ui.text.CTextTools; +import org.eclipse.cdt.internal.ui.text.CWordFinder; +import org.eclipse.cdt.internal.ui.text.CWordIterator; +import org.eclipse.cdt.internal.ui.text.DocumentCharacterIterator; +import org.eclipse.cdt.internal.ui.text.ICReconcilingListener; +import org.eclipse.cdt.internal.ui.text.Symbols; +import org.eclipse.cdt.internal.ui.text.TabsToSpacesConverter; +import org.eclipse.cdt.internal.ui.text.c.hover.CExpandHover; +import org.eclipse.cdt.internal.ui.text.c.hover.SourceViewerInformationControl; +import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference; +import org.eclipse.cdt.internal.ui.util.CUIHelp; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.internal.ui.viewsupport.ISelectionListenerWithAST; +import org.eclipse.cdt.internal.ui.viewsupport.SelectionListenerWithASTManager; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.ICEditor; +import org.eclipse.cdt.ui.ICModelBasedEditor; +import org.eclipse.cdt.ui.IWorkingCopyManager; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.actions.GenerateActionGroup; +import org.eclipse.cdt.ui.actions.OpenViewActionGroup; +import org.eclipse.cdt.ui.refactoring.actions.CRefactoringActionGroup; +import org.eclipse.cdt.ui.text.CSourceViewerConfiguration; +import org.eclipse.cdt.ui.text.ICPartitions; +import org.eclipse.cdt.ui.text.folding.ICFoldingStructureProvider; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.ProjectScope; @@ -179,78 +248,6 @@ import org.eclipse.ui.views.contentoutline.IContentOutlinePage; import com.ibm.icu.text.BreakIterator; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.CCorePreferenceConstants; -import org.eclipse.cdt.core.dom.ast.IASTName; -import org.eclipse.cdt.core.dom.ast.IASTNodeSelector; -import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.ast.IBinding; -import org.eclipse.cdt.core.dom.ast.gnu.cpp.GPPLanguage; -import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.ISourceRange; -import org.eclipse.cdt.core.model.ISourceReference; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.model.ITranslationUnitHolder; -import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.ICEditor; -import org.eclipse.cdt.ui.ICModelBasedEditor; -import org.eclipse.cdt.ui.IWorkingCopyManager; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.actions.GenerateActionGroup; -import org.eclipse.cdt.ui.actions.OpenViewActionGroup; -import org.eclipse.cdt.ui.refactoring.actions.CRefactoringActionGroup; -import org.eclipse.cdt.ui.text.CSourceViewerConfiguration; -import org.eclipse.cdt.ui.text.ICPartitions; -import org.eclipse.cdt.ui.text.folding.ICFoldingStructureProvider; - -import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; -import org.eclipse.cdt.internal.corext.util.CodeFormatterUtil; - -import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.IContextMenuConstants; -import org.eclipse.cdt.internal.ui.actions.AddBlockCommentAction; -import org.eclipse.cdt.internal.ui.actions.AlignConstAction; -import org.eclipse.cdt.internal.ui.actions.FindWordAction; -import org.eclipse.cdt.internal.ui.actions.FoldingActionGroup; -import org.eclipse.cdt.internal.ui.actions.GoToNextPreviousMemberAction; -import org.eclipse.cdt.internal.ui.actions.GotoNextBookmarkAction; -import org.eclipse.cdt.internal.ui.actions.IndentAction; -import org.eclipse.cdt.internal.ui.actions.RemoveBlockCommentAction; -import org.eclipse.cdt.internal.ui.actions.StructureSelectEnclosingAction; -import org.eclipse.cdt.internal.ui.actions.StructureSelectHistoryAction; -import org.eclipse.cdt.internal.ui.actions.StructureSelectNextAction; -import org.eclipse.cdt.internal.ui.actions.StructureSelectPreviousAction; -import org.eclipse.cdt.internal.ui.actions.StructureSelectionAction; -import org.eclipse.cdt.internal.ui.actions.SurroundWithActionGroup; -import org.eclipse.cdt.internal.ui.dialogs.FormattingScopeDialog; -import org.eclipse.cdt.internal.ui.search.IOccurrencesFinder; -import org.eclipse.cdt.internal.ui.search.IOccurrencesFinder.OccurrenceLocation; -import org.eclipse.cdt.internal.ui.search.OccurrencesFinder; -import org.eclipse.cdt.internal.ui.search.actions.SelectionSearchGroup; -import org.eclipse.cdt.internal.ui.text.CHeuristicScanner; -import org.eclipse.cdt.internal.ui.text.CPairMatcher; -import org.eclipse.cdt.internal.ui.text.CSourceViewerScalableConfiguration; -import org.eclipse.cdt.internal.ui.text.CTextTools; -import org.eclipse.cdt.internal.ui.text.CWordFinder; -import org.eclipse.cdt.internal.ui.text.CWordIterator; -import org.eclipse.cdt.internal.ui.text.DocumentCharacterIterator; -import org.eclipse.cdt.internal.ui.text.ICReconcilingListener; -import org.eclipse.cdt.internal.ui.text.Symbols; -import org.eclipse.cdt.internal.ui.text.TabsToSpacesConverter; -import org.eclipse.cdt.internal.ui.text.c.hover.CExpandHover; -import org.eclipse.cdt.internal.ui.text.c.hover.SourceViewerInformationControl; -import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference; -import org.eclipse.cdt.internal.ui.util.CUIHelp; -import org.eclipse.cdt.internal.ui.util.EditorUtility; -import org.eclipse.cdt.internal.ui.viewsupport.ISelectionListenerWithAST; -import org.eclipse.cdt.internal.ui.viewsupport.SelectionListenerWithASTManager; - /** * C/C++ source editor. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java index a17e9ba6d27..a2dc79c3a19 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java @@ -19,6 +19,16 @@ package org.eclipse.cdt.internal.ui.editor; import java.util.ResourceBundle; +import org.eclipse.cdt.internal.ui.IContextMenuConstants; +import org.eclipse.cdt.internal.ui.actions.FindWordAction; +import org.eclipse.cdt.internal.ui.actions.GoToNextPreviousMemberAction; +import org.eclipse.cdt.internal.ui.actions.GotoNextBookmarkAction; +import org.eclipse.cdt.internal.ui.actions.StructureSelectEnclosingAction; +import org.eclipse.cdt.internal.ui.actions.StructureSelectHistoryAction; +import org.eclipse.cdt.internal.ui.actions.StructureSelectNextAction; +import org.eclipse.cdt.internal.ui.actions.StructureSelectPreviousAction; +import org.eclipse.cdt.internal.ui.actions.StructureSelectionAction; +import org.eclipse.cdt.ui.actions.CdtActionConstants; import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; @@ -33,18 +43,6 @@ import org.eclipse.ui.texteditor.ITextEditorActionConstants; import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds; import org.eclipse.ui.texteditor.RetargetTextEditorAction; -import org.eclipse.cdt.ui.actions.CdtActionConstants; - -import org.eclipse.cdt.internal.ui.IContextMenuConstants; -import org.eclipse.cdt.internal.ui.actions.FindWordAction; -import org.eclipse.cdt.internal.ui.actions.GoToNextPreviousMemberAction; -import org.eclipse.cdt.internal.ui.actions.GotoNextBookmarkAction; -import org.eclipse.cdt.internal.ui.actions.StructureSelectEnclosingAction; -import org.eclipse.cdt.internal.ui.actions.StructureSelectHistoryAction; -import org.eclipse.cdt.internal.ui.actions.StructureSelectNextAction; -import org.eclipse.cdt.internal.ui.actions.StructureSelectPreviousAction; -import org.eclipse.cdt.internal.ui.actions.StructureSelectionAction; - public class CEditorActionContributor extends TextEditorActionContributor { private RetargetTextEditorAction fContentAssist; private RetargetTextEditorAction fContextInformation; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorErrorTickUpdater.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorErrorTickUpdater.java index b726314ea93..5e627d5c12e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorErrorTickUpdater.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorErrorTickUpdater.java @@ -14,20 +14,18 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.editor; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.Assert; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.IEditorInput; - import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.ui.util.IProblemChangedListener; import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider; import org.eclipse.cdt.internal.ui.viewsupport.ProblemsLabelDecorator; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.Assert; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.IEditorInput; /** * The <code>JavaEditorErrorTickUpdater</code> will register as a AnnotationModelListener diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementHyperlinkDetector.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementHyperlinkDetector.java index 60b7be813e3..39ef1c90c90 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementHyperlinkDetector.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementHyperlinkDetector.java @@ -16,20 +16,6 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.editor; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.ITextViewer; -import org.eclipse.jface.text.Region; -import org.eclipse.jface.text.TextUtilities; -import org.eclipse.jface.text.hyperlink.AbstractHyperlinkDetector; -import org.eclipse.jface.text.hyperlink.IHyperlink; -import org.eclipse.ui.texteditor.ITextEditor; - import org.eclipse.cdt.core.dom.ast.IASTImageLocation; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTNode; @@ -41,17 +27,28 @@ import org.eclipse.cdt.core.dom.ast.IASTTypeId; import org.eclipse.cdt.core.model.ICLanguageKeywords; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.ICModelBasedEditor; -import org.eclipse.cdt.ui.text.ICPartitions; - import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil; import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; import org.eclipse.cdt.internal.formatter.scanner.Scanner; import org.eclipse.cdt.internal.formatter.scanner.Token; - import org.eclipse.cdt.internal.ui.text.CWordFinder; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.ICModelBasedEditor; +import org.eclipse.cdt.ui.text.ICPartitions; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.ITextViewer; +import org.eclipse.jface.text.Region; +import org.eclipse.jface.text.TextUtilities; +import org.eclipse.jface.text.hyperlink.AbstractHyperlinkDetector; +import org.eclipse.jface.text.hyperlink.IHyperlink; +import org.eclipse.ui.texteditor.ITextEditor; public class CElementHyperlinkDetector extends AbstractHyperlinkDetector { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementIncludeResolver.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementIncludeResolver.java index 647e1db19c4..000315c2529 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementIncludeResolver.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementIncludeResolver.java @@ -15,6 +15,15 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.model.IInclude; +import org.eclipse.cdt.core.parser.ExtendedScannerInfo; +import org.eclipse.cdt.core.parser.IExtendedScannerInfo; +import org.eclipse.cdt.core.parser.IScannerInfo; +import org.eclipse.cdt.core.parser.IScannerInfoProvider; +import org.eclipse.cdt.internal.core.resources.ResourceLookup; +import org.eclipse.cdt.utils.PathUtil; +import org.eclipse.cdt.utils.UNCPathConverter; import org.eclipse.core.filesystem.EFS; import org.eclipse.core.filesystem.IFileStore; import org.eclipse.core.resources.IContainer; @@ -30,17 +39,6 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.model.IInclude; -import org.eclipse.cdt.core.parser.ExtendedScannerInfo; -import org.eclipse.cdt.core.parser.IExtendedScannerInfo; -import org.eclipse.cdt.core.parser.IScannerInfo; -import org.eclipse.cdt.core.parser.IScannerInfoProvider; -import org.eclipse.cdt.utils.PathUtil; -import org.eclipse.cdt.utils.UNCPathConverter; - -import org.eclipse.cdt.internal.core.resources.ResourceLookup; - /** * Handles resolution of an include represented as a CElement (IInclude). */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CMarkerAnnotation.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CMarkerAnnotation.java index 4ee9641bde2..b96c989f3df 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CMarkerAnnotation.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CMarkerAnnotation.java @@ -17,14 +17,13 @@ package org.eclipse.cdt.internal.ui.editor; import java.util.Iterator; -import org.eclipse.core.resources.IMarker; -import org.eclipse.ui.texteditor.MarkerAnnotation; -import org.eclipse.ui.texteditor.MarkerUtilities; - import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICModelMarker; import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.core.resources.IMarker; +import org.eclipse.ui.texteditor.MarkerAnnotation; +import org.eclipse.ui.texteditor.MarkerUtilities; public class CMarkerAnnotation extends MarkerAnnotation implements IProblemAnnotation, ICAnnotation { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSelectMarkerRulerAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSelectMarkerRulerAction.java index a7b477462ad..8bea0c1eca6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSelectMarkerRulerAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSelectMarkerRulerAction.java @@ -16,29 +16,24 @@ package org.eclipse.cdt.internal.ui.editor; import java.util.ResourceBundle; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Event; - +import org.eclipse.cdt.internal.ui.text.c.hover.CExpandHover; +import org.eclipse.cdt.internal.ui.text.correction.CCorrectionProcessor; +import org.eclipse.cdt.internal.ui.text.correction.QuickAssistLightBulbUpdater.AssistAnnotation; import org.eclipse.jface.action.IAction; - import org.eclipse.jface.text.ITextOperationTarget; import org.eclipse.jface.text.Position; import org.eclipse.jface.text.source.Annotation; import org.eclipse.jface.text.source.IAnnotationModel; import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.jface.text.source.VerticalRulerEvent; - +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Event; import org.eclipse.ui.ISelectionListener; - import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.ITextEditorActionConstants; import org.eclipse.ui.texteditor.IUpdate; import org.eclipse.ui.texteditor.SelectAnnotationRulerAction; -import org.eclipse.cdt.internal.ui.text.correction.CCorrectionProcessor; -import org.eclipse.cdt.internal.ui.text.correction.QuickAssistLightBulbUpdater.AssistAnnotation; -import org.eclipse.cdt.internal.ui.text.c.hover.CExpandHover; - /** * A special select marker ruler action which activates quick fix if clicked on a quick fixable problem. * <p> diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSourceViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSourceViewer.java index 920b0bf9a8e..5ede0b64d32 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSourceViewer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSourceViewer.java @@ -19,6 +19,12 @@ package org.eclipse.cdt.internal.ui.editor; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.internal.ui.text.CTextTools; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.CSourceViewerConfiguration; +import org.eclipse.cdt.ui.text.ICColorConstants; +import org.eclipse.cdt.ui.text.IColorManager; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferenceConverter; @@ -51,14 +57,6 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants; import org.eclipse.ui.texteditor.AbstractTextEditor; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.CSourceViewerConfiguration; -import org.eclipse.cdt.ui.text.ICColorConstants; -import org.eclipse.cdt.ui.text.IColorManager; - -import org.eclipse.cdt.internal.ui.text.CTextTools; - /** * Source viewer for C/C++ et al. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSourceViewerDecorationSupport.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSourceViewerDecorationSupport.java index c64fb4a4dbb..ca8335a6dea 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSourceViewerDecorationSupport.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSourceViewerDecorationSupport.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.editor; +import org.eclipse.cdt.internal.ui.LineBackgroundPainter; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.jface.text.ITextViewerExtension2; @@ -25,8 +26,6 @@ import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.RGB; import org.eclipse.ui.texteditor.SourceViewerDecorationSupport; -import org.eclipse.cdt.internal.ui.LineBackgroundPainter; - /** * <code>SourceViewerDecorationSupport</code> with extension(s): * <ul> diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CStorageDocumentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CStorageDocumentProvider.java index b4ee96a42d1..68e07217d1e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CStorageDocumentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CStorageDocumentProvider.java @@ -13,10 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.editor; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.ui.text.CTextTools; - +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.source.AnnotationModel; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CTemplatesPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CTemplatesPage.java index 0f0911f7641..40c5f03995e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CTemplatesPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CTemplatesPage.java @@ -14,6 +14,19 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.editor; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.corext.template.c.CContext; +import org.eclipse.cdt.internal.corext.template.c.CContextType; +import org.eclipse.cdt.internal.ui.preferences.CSourcePreviewerUpdater; +import org.eclipse.cdt.internal.ui.preferences.EditTemplateDialog; +import org.eclipse.cdt.internal.ui.text.CTextTools; +import org.eclipse.cdt.internal.ui.text.SimpleCSourceViewerConfiguration; +import org.eclipse.cdt.internal.ui.text.template.TemplateVariableProcessor; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.text.BadLocationException; @@ -41,22 +54,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.texteditor.templates.AbstractTemplatesPage; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.ICPartitions; - -import org.eclipse.cdt.internal.corext.template.c.CContext; -import org.eclipse.cdt.internal.corext.template.c.CContextType; - -import org.eclipse.cdt.internal.ui.preferences.CSourcePreviewerUpdater; -import org.eclipse.cdt.internal.ui.preferences.EditTemplateDialog; -import org.eclipse.cdt.internal.ui.text.CTextTools; -import org.eclipse.cdt.internal.ui.text.SimpleCSourceViewerConfiguration; -import org.eclipse.cdt.internal.ui.text.template.TemplateVariableProcessor; -import org.eclipse.cdt.internal.ui.util.EditorUtility; - /** * The templates page for the C editor. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ContributedSemanticHighlighting.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ContributedSemanticHighlighting.java index b25c8b50dbb..ee5848859f2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ContributedSemanticHighlighting.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ContributedSemanticHighlighting.java @@ -13,6 +13,13 @@ package org.eclipse.cdt.internal.ui.editor; import java.util.Arrays; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.ISemanticHighlighter; +import org.eclipse.cdt.ui.text.ISemanticToken; import org.eclipse.core.expressions.EvaluationContext; import org.eclipse.core.expressions.EvaluationResult; import org.eclipse.core.expressions.Expression; @@ -24,14 +31,6 @@ import org.eclipse.jface.resource.DataFormatException; import org.eclipse.jface.resource.StringConverter; import org.eclipse.swt.graphics.RGB; -import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.ISemanticHighlighter; -import org.eclipse.cdt.ui.text.ISemanticToken; - public class ContributedSemanticHighlighting extends SemanticHighlightingWithOwnPreference { /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CustomBufferFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CustomBufferFactory.java index 97c431309d9..23ef96fb5d9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CustomBufferFactory.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CustomBufferFactory.java @@ -17,16 +17,15 @@ package org.eclipse.cdt.internal.ui.editor; import java.net.URI; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; import org.eclipse.cdt.core.model.IBuffer; import org.eclipse.cdt.core.model.IOpenable; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.core.model.IBufferFactory; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; /** * CustomBufferFactory diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DefaultBinaryFileEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DefaultBinaryFileEditor.java index 4fb0b72b30c..b700e191bc3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DefaultBinaryFileEditor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DefaultBinaryFileEditor.java @@ -17,6 +17,15 @@ package org.eclipse.cdt.internal.ui.editor; import java.io.ByteArrayInputStream; import java.io.IOException; +import org.eclipse.cdt.core.IBinaryParser; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.IBinary; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.resources.FileStorage; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.utils.IGnuToolFactory; +import org.eclipse.cdt.utils.Objdump; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResourceChangeEvent; import org.eclipse.core.resources.IResourceChangeListener; @@ -41,17 +50,6 @@ import org.eclipse.ui.ide.ResourceUtil; import org.eclipse.ui.part.FileEditorInput; import org.eclipse.ui.texteditor.AbstractTextEditor; -import org.eclipse.cdt.core.IBinaryParser; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.IBinary; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.resources.FileStorage; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.utils.IGnuToolFactory; -import org.eclipse.cdt.utils.Objdump; - -import org.eclipse.cdt.internal.ui.util.EditorUtility; - /** * A readonly editor to view binary files. This default implementation displays the GNU objdump output of the * binary as plain text. If no objdump output can be obtained, the binary content is displayed. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DocumentAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DocumentAdapter.java index 33e0f218da3..254fa95aeea 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DocumentAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DocumentAdapter.java @@ -21,6 +21,12 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import org.eclipse.cdt.core.model.BufferChangedEvent; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.IBuffer; +import org.eclipse.cdt.core.model.IBufferChangedListener; +import org.eclipse.cdt.core.model.IOpenable; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.filebuffers.FileBuffers; import org.eclipse.core.filebuffers.ITextFileBuffer; import org.eclipse.core.filebuffers.ITextFileBufferManager; @@ -45,13 +51,6 @@ import org.eclipse.jface.text.IDocumentListener; import org.eclipse.jface.text.ISynchronizable; import org.eclipse.swt.widgets.Display; -import org.eclipse.cdt.core.model.BufferChangedEvent; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.IBuffer; -import org.eclipse.cdt.core.model.IBufferChangedListener; -import org.eclipse.cdt.core.model.IOpenable; -import org.eclipse.cdt.ui.CUIPlugin; - /** * Adapts <code>IDocument</code> to <code>IBuffer</code>. Uses the * same algorithm as the text widget to determine the buffer's line delimiter. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchAnnotationModel.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchAnnotationModel.java index cf183d66384..3da85bb68e6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchAnnotationModel.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchAnnotationModel.java @@ -15,6 +15,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.editor; +import org.eclipse.cdt.core.model.ICModelMarker; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; @@ -22,8 +23,6 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.ui.texteditor.ResourceMarkerAnnotationModel; -import org.eclipse.cdt.core.model.ICModelMarker; - public class ExternalSearchAnnotationModel extends ResourceMarkerAnnotationModel { private final IPath fLocation; private final int fDepth; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchDocumentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchDocumentProvider.java index 2fe2161e665..120dffba913 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchDocumentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchDocumentProvider.java @@ -17,6 +17,8 @@ package org.eclipse.cdt.internal.ui.editor; import java.net.URI; +import org.eclipse.cdt.internal.ui.util.ExternalEditorInput; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.filesystem.URIUtil; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IStorage; @@ -31,10 +33,6 @@ import org.eclipse.ui.editors.text.ILocationProvider; import org.eclipse.ui.editors.text.ILocationProviderExtension; import org.eclipse.ui.editors.text.TextFileDocumentProvider; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.util.ExternalEditorInput; - public class ExternalSearchDocumentProvider extends TextFileDocumentProvider { public ExternalSearchDocumentProvider() { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/GotoMatchingBracketAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/GotoMatchingBracketAction.java index e9f21045f5f..50f67f7d5c4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/GotoMatchingBracketAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/GotoMatchingBracketAction.java @@ -14,13 +14,11 @@ package org.eclipse.cdt.internal.ui.editor; -import org.eclipse.jface.action.Action; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; import org.eclipse.core.runtime.Assert; - +import org.eclipse.jface.action.Action; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; - public class GotoMatchingBracketAction extends Action { public final static String GOTO_MATCHING_BRACKET = "GotoMatchingBracket"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/IPostSaveListener.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/IPostSaveListener.java index 2beae0e4bb1..91cbc3c1f3c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/IPostSaveListener.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/IPostSaveListener.java @@ -13,9 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.editor; -import org.eclipse.core.runtime.IProgressMonitor; - import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.core.runtime.IProgressMonitor; /** * Listener that is informed when a translation unit is saved. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/InactiveCodeHighlighting.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/InactiveCodeHighlighting.java index 518f6b38ff5..a2daeb77e47 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/InactiveCodeHighlighting.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/InactiveCodeHighlighting.java @@ -20,18 +20,6 @@ import java.util.EmptyStackException; import java.util.List; import java.util.Stack; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.ITextInputListener; -import org.eclipse.jface.text.Position; -import org.eclipse.jface.text.TypedPosition; -import org.eclipse.swt.widgets.Display; - import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IASTPreprocessorElifStatement; import org.eclipse.cdt.core.dom.ast.IASTPreprocessorElseStatement; @@ -44,12 +32,21 @@ import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.core.model.ASTCache; - import org.eclipse.cdt.internal.ui.LineBackgroundPainter; import org.eclipse.cdt.internal.ui.text.ICReconcilingListener; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.ITextInputListener; +import org.eclipse.jface.text.Position; +import org.eclipse.jface.text.TypedPosition; +import org.eclipse.swt.widgets.Display; /** * Paints code lines disabled by preprocessor directives (#ifdef etc.) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/IndentUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/IndentUtil.java index da7acae18a8..56831d0edda 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/IndentUtil.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/IndentUtil.java @@ -15,6 +15,13 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.editor; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.internal.corext.util.CodeFormatterUtil; +import org.eclipse.cdt.internal.ui.text.CHeuristicScanner; +import org.eclipse.cdt.internal.ui.text.CIndenter; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; @@ -23,16 +30,6 @@ import org.eclipse.jface.text.TextUtilities; import org.eclipse.jface.text.source.ILineRange; import org.eclipse.jface.text.source.LineRange; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.text.ICPartitions; - -import org.eclipse.cdt.internal.corext.util.CodeFormatterUtil; - -import org.eclipse.cdt.internal.ui.text.CHeuristicScanner; -import org.eclipse.cdt.internal.ui.text.CIndenter; - /** * Utility that indents a number of lines in a document. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/IndexUpdateRequestor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/IndexUpdateRequestor.java index 7d92171a2e8..38415f8e5c4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/IndexUpdateRequestor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/IndexUpdateRequestor.java @@ -15,6 +15,12 @@ package org.eclipse.cdt.internal.ui.editor; import java.util.Objects; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.index.IIndexManager; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.core.pdom.indexer.IndexerPreferences; +import org.eclipse.cdt.internal.corext.util.CModelUtil; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; @@ -24,14 +30,6 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener; import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.index.IIndexManager; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ITranslationUnit; - -import org.eclipse.cdt.internal.core.pdom.indexer.IndexerPreferences; -import org.eclipse.cdt.internal.corext.util.CModelUtil; - /** * A controller for on-demand indexing of files opened in C/C++ editors. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/InteractiveHeaderChooser.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/InteractiveHeaderChooser.java index 902026106c5..a3badc46ee4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/InteractiveHeaderChooser.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/InteractiveHeaderChooser.java @@ -19,6 +19,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import org.eclipse.cdt.internal.ui.refactoring.includes.IHeaderChooser; import org.eclipse.core.runtime.IPath; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.window.Window; @@ -27,8 +28,6 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.dialogs.ElementListSelectionDialog; -import org.eclipse.cdt.internal.ui.refactoring.includes.IHeaderChooser; - /** * Dialog-based header chooser. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/LexicalSortingAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/LexicalSortingAction.java index 6827350d8e6..525f98d5faa 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/LexicalSortingAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/LexicalSortingAction.java @@ -15,15 +15,13 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.editor; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.ui.CElementSorter; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.action.Action; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.ViewerComparator; -import org.eclipse.cdt.ui.CElementSorter; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.CPluginImages; - public class LexicalSortingAction extends Action { private static final String ACTION_NAME = "LexicalSortingAction"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java index d9ceffbb736..abebf106414 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java @@ -19,6 +19,12 @@ package org.eclipse.cdt.internal.ui.editor; import java.util.List; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.IInclude; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.internal.ui.actions.OpenActionUtil; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; @@ -29,14 +35,6 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.MessageBox; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.IInclude; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.internal.ui.actions.OpenActionUtil; -import org.eclipse.cdt.internal.ui.util.EditorUtility; - public class OpenIncludeAction extends Action { private static final String PREFIX = "OpenIncludeAction."; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OrganizeIncludesAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OrganizeIncludesAction.java index a335a00b4c0..1e6945fcd4a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OrganizeIncludesAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OrganizeIncludesAction.java @@ -14,6 +14,17 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.editor; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.index.IIndexManager; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.core.model.ASTCache; +import org.eclipse.cdt.internal.ui.BusyCursorJobRunner; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.refactoring.includes.IHeaderChooser; +import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeOrganizer; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -31,20 +42,6 @@ import org.eclipse.ui.IEditorInput; import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.TextEditorAction; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.index.IIndex; -import org.eclipse.cdt.core.index.IIndexManager; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.core.model.ASTCache; - -import org.eclipse.cdt.internal.ui.BusyCursorJobRunner; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.refactoring.includes.IHeaderChooser; -import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeOrganizer; - /** * Organizes the include directives and forward declarations of a source or header file. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OverrideIndicatorImageProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OverrideIndicatorImageProvider.java index bb060d4180b..8c450be62b2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OverrideIndicatorImageProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OverrideIndicatorImageProvider.java @@ -13,13 +13,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.editor; +import org.eclipse.cdt.internal.ui.CPluginImages; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.text.source.Annotation; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.texteditor.IAnnotationImageProvider; -import org.eclipse.cdt.internal.ui.CPluginImages; - /** * @author Tomasz Wesolowski */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OverrideIndicatorManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OverrideIndicatorManager.java index e0940ea7389..7b989a51c9c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OverrideIndicatorManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OverrideIndicatorManager.java @@ -19,15 +19,6 @@ package org.eclipse.cdt.internal.ui.editor; import java.util.HashMap; import java.util.Map; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.jface.text.ISynchronizable; -import org.eclipse.jface.text.Position; -import org.eclipse.jface.text.source.Annotation; -import org.eclipse.jface.text.source.IAnnotationModel; -import org.eclipse.jface.text.source.IAnnotationModelExtension; - import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.DOMException; import org.eclipse.cdt.core.dom.ast.IASTDeclarator; @@ -41,16 +32,22 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType; import org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod; import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.parser.util.ArrayUtil; -import org.eclipse.cdt.ui.CDTUITools; - import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; import org.eclipse.cdt.internal.core.dom.parser.cpp.ClassTypeHelper; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPSemantics; import org.eclipse.cdt.internal.core.model.ASTStringUtil; import org.eclipse.cdt.internal.core.model.ext.ICElementHandle; - import org.eclipse.cdt.internal.ui.text.ICReconcilingListener; import org.eclipse.cdt.internal.ui.viewsupport.IndexUI; +import org.eclipse.cdt.ui.CDTUITools; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jface.text.ISynchronizable; +import org.eclipse.jface.text.Position; +import org.eclipse.jface.text.source.Annotation; +import org.eclipse.jface.text.source.IAnnotationModel; +import org.eclipse.jface.text.source.IAnnotationModelExtension; public class OverrideIndicatorManager implements ICReconcilingListener { public static final String ANNOTATION_TYPE = "org.eclipse.cdt.ui.overrideIndicator"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SelectionHistory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SelectionHistory.java index dac662377a5..9f15c4f8747 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SelectionHistory.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SelectionHistory.java @@ -16,12 +16,11 @@ package org.eclipse.cdt.internal.ui.editor; import java.util.Stack; +import org.eclipse.cdt.core.model.ISourceRange; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.cdt.core.model.ISourceRange; - public class SelectionHistory { private Stack<ISourceRange> fHistory; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SelectionToDeclarationJob.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SelectionToDeclarationJob.java index 0375d31fd17..710188148a5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SelectionToDeclarationJob.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SelectionToDeclarationJob.java @@ -21,16 +21,6 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.text.Region; -import org.eclipse.ui.texteditor.ITextEditor; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IName; import org.eclipse.cdt.core.dom.ast.IASTDeclaration; @@ -62,17 +52,24 @@ import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.model.IWorkingCopy; import org.eclipse.cdt.core.parser.util.ArrayUtil; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.core.dom.parser.ASTNode; import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; import org.eclipse.cdt.internal.core.index.IIndexFragmentName; import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; import org.eclipse.cdt.internal.core.model.ext.CElementHandleFactory; import org.eclipse.cdt.internal.core.model.ext.ICElementHandle; - import org.eclipse.cdt.internal.ui.ICStatusConstants; import org.eclipse.cdt.internal.ui.viewsupport.IndexUI; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.jface.text.Region; +import org.eclipse.ui.texteditor.ITextEditor; /** * Based on class OpenDeclarationsJob diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingManager.java index d88a32ed38b..e932f37e45d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingManager.java @@ -19,20 +19,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.preference.PreferenceConverter; -import org.eclipse.jface.resource.StringConverter; -import org.eclipse.jface.text.Position; -import org.eclipse.jface.text.Region; -import org.eclipse.jface.text.TextAttribute; -import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.swt.SWT; -import org.eclipse.swt.custom.StyleRange; -import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.graphics.RGB; - import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; @@ -44,18 +30,29 @@ import org.eclipse.cdt.core.parser.IScannerInfo; import org.eclipse.cdt.core.parser.IncludeFileContentProvider; import org.eclipse.cdt.core.parser.ParserUtil; import org.eclipse.cdt.core.parser.ScannerInfo; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.CSourceViewerConfiguration; -import org.eclipse.cdt.ui.text.ICPartitions; -import org.eclipse.cdt.ui.text.IColorManager; -import org.eclipse.cdt.ui.text.ISemanticToken; - import org.eclipse.cdt.internal.core.parser.scanner.CharArray; import org.eclipse.cdt.internal.core.parser.scanner.InternalFileContent; - import org.eclipse.cdt.internal.ui.editor.SemanticHighlightingReconciler.AbstractPositionCollector; import org.eclipse.cdt.internal.ui.text.CPresentationReconciler; import org.eclipse.cdt.internal.ui.text.CSourceViewerScalableConfiguration; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.CSourceViewerConfiguration; +import org.eclipse.cdt.ui.text.ICPartitions; +import org.eclipse.cdt.ui.text.IColorManager; +import org.eclipse.cdt.ui.text.ISemanticToken; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.jface.preference.PreferenceConverter; +import org.eclipse.jface.resource.StringConverter; +import org.eclipse.jface.text.Position; +import org.eclipse.jface.text.Region; +import org.eclipse.jface.text.TextAttribute; +import org.eclipse.jface.util.IPropertyChangeListener; +import org.eclipse.jface.util.PropertyChangeEvent; +import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.StyleRange; +import org.eclipse.swt.graphics.Color; +import org.eclipse.swt.graphics.RGB; /** * Semantic highlighting manager. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingPresenter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingPresenter.java index 4a6c9094570..5d8297a87e2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingPresenter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingPresenter.java @@ -18,6 +18,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.eclipse.cdt.internal.ui.editor.SemanticHighlightingManager.HighlightedPosition; +import org.eclipse.cdt.internal.ui.editor.SemanticHighlightingManager.HighlightingStyle; +import org.eclipse.cdt.internal.ui.text.CPresentationReconciler; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.BadPositionCategoryException; import org.eclipse.jface.text.DocumentEvent; @@ -33,12 +37,6 @@ import org.eclipse.jface.text.Region; import org.eclipse.jface.text.TextPresentation; import org.eclipse.swt.custom.StyleRange; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.editor.SemanticHighlightingManager.HighlightedPosition; -import org.eclipse.cdt.internal.ui.editor.SemanticHighlightingManager.HighlightingStyle; -import org.eclipse.cdt.internal.ui.text.CPresentationReconciler; - /** * Semantic highlighting presenter - UI thread implementation. * Cloned from JDT. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingReconciler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingReconciler.java index 11f8258f1ed..db55fded183 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingReconciler.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingReconciler.java @@ -20,17 +20,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jface.text.Position; -import org.eclipse.jface.text.TextPresentation; -import org.eclipse.jface.text.source.ISourceViewer; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.IWorkbenchPartSite; - import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTDeclaration; import org.eclipse.cdt.core.dom.ast.IASTDeclarator; @@ -49,16 +38,24 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNamespaceDefinition; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTVirtSpecifier; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.core.dom.parser.ASTNode; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPSemantics; import org.eclipse.cdt.internal.core.model.ASTCache; import org.eclipse.cdt.internal.core.parser.scanner.ASTPreprocessorName; - import org.eclipse.cdt.internal.ui.editor.SemanticHighlightingManager.HighlightedPosition; import org.eclipse.cdt.internal.ui.editor.SemanticHighlightingManager.HighlightingStyle; import org.eclipse.cdt.internal.ui.text.ICReconcilingListener; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.text.Position; +import org.eclipse.jface.text.TextPresentation; +import org.eclipse.jface.text.source.ISourceViewer; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.IWorkbenchPartSite; /** * Semantic highlighting reconciler - Background thread implementation. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingWithOwnPreference.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingWithOwnPreference.java index 64025eb33f3..ccc261bf9ec 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingWithOwnPreference.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingWithOwnPreference.java @@ -13,12 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.editor; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.resource.ColorRegistry; import org.eclipse.swt.graphics.RGB; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.ui.CUIPlugin; - /** * A semantic highlighting which has its own preferences for specifying * its color and style. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightings.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightings.java index 5ea9a50d12f..36f30dc50dc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightings.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightings.java @@ -14,20 +14,16 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.editor; +import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.REF; +import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.TDEF; + import java.util.Map; import java.util.TreeMap; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.Platform; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.preference.PreferenceConverter; -import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.swt.graphics.RGB; - import org.eclipse.cdt.core.dom.ast.DOMException; import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier; import org.eclipse.cdt.core.dom.ast.IASTExpression; +import org.eclipse.cdt.core.dom.ast.IASTExpression.ValueCategory; import org.eclipse.cdt.core.dom.ast.IASTFunctionCallExpression; import org.eclipse.cdt.core.dom.ast.IASTFunctionDeclarator; import org.eclipse.cdt.core.dom.ast.IASTImplicitName; @@ -52,7 +48,6 @@ import org.eclipse.cdt.core.dom.ast.IScope; import org.eclipse.cdt.core.dom.ast.IType; import org.eclipse.cdt.core.dom.ast.ITypedef; import org.eclipse.cdt.core.dom.ast.IVariable; -import org.eclipse.cdt.core.dom.ast.IASTExpression.ValueCategory; import org.eclipse.cdt.core.dom.ast.c.ICExternalBinding; import org.eclipse.cdt.core.dom.ast.c.ICFunctionScope; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTClassVirtSpecifier; @@ -71,6 +66,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPBlockScope; import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType; import org.eclipse.cdt.core.dom.ast.cpp.ICPPConstructor; import org.eclipse.cdt.core.dom.ast.cpp.ICPPDeferredFunction; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPEnumeration; import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunction; import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunctionScope; import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunctionType; @@ -79,27 +75,29 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPNamespace; import org.eclipse.cdt.core.dom.ast.cpp.ICPPReferenceType; import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateNonTypeParameter; import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameter; -import org.eclipse.cdt.core.dom.ast.cpp.ICPPEnumeration; import org.eclipse.cdt.core.dom.ast.cpp.ICPPUsingDeclaration; import org.eclipse.cdt.core.dom.ast.cpp.SemanticQueries; import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.index.IIndexBinding; import org.eclipse.cdt.core.index.IIndexFile; import org.eclipse.cdt.core.index.IIndexName; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.ICColorConstants; -import org.eclipse.cdt.ui.text.ISemanticToken; - import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPUnknownBinding; import org.eclipse.cdt.internal.core.dom.parser.cpp.OverloadableOperator; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPFunctionSet; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.FunctionSetType; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.HeuristicResolver; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil; - -import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.REF; -import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.TDEF; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.ICColorConstants; +import org.eclipse.cdt.ui.text.ISemanticToken; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.Platform; +import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.jface.preference.PreferenceConverter; +import org.eclipse.jface.util.PropertyChangeEvent; +import org.eclipse.swt.graphics.RGB; /** * Semantic highlightings. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SortLinesAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SortLinesAction.java index 878e58a47ec..3a94a33bcd1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SortLinesAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SortLinesAction.java @@ -15,6 +15,12 @@ package org.eclipse.cdt.internal.ui.editor; import java.util.Arrays; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.internal.corext.util.CodeFormatterUtil; +import org.eclipse.cdt.internal.corext.util.Strings; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; @@ -33,15 +39,6 @@ import org.eclipse.ui.texteditor.TextEditorAction; import com.ibm.icu.text.Collator; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.ICPartitions; - -import org.eclipse.cdt.internal.corext.util.CodeFormatterUtil; -import org.eclipse.cdt.internal.corext.util.Strings; - -import org.eclipse.cdt.internal.ui.util.EditorUtility; - /** * Sorts selected lines in alphabetical order. If both, comment and non-comment lines * are selected, the non-comment lines are sorted, and the comments are moved together diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SourceHeaderPartnerFinder.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SourceHeaderPartnerFinder.java index 1feaa4ebf84..9b5a7c7fd69 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SourceHeaderPartnerFinder.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SourceHeaderPartnerFinder.java @@ -20,23 +20,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IResourceProxy; -import org.eclipse.core.resources.IResourceProxyVisitor; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.content.IContentType; -import org.eclipse.core.runtime.content.IContentTypeManager; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTDeclarator; @@ -52,11 +35,25 @@ import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; - import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContext; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IResourceProxy; +import org.eclipse.core.resources.IResourceProxyVisitor; +import org.eclipse.core.resources.IWorkspaceRoot; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.content.IContentType; +import org.eclipse.core.runtime.content.IContentTypeManager; /** * A collection of static methods for finding the source file corresponding to a header diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SpecificContentAssistAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SpecificContentAssistAction.java index c37d45dbce5..ee8cfa99516 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SpecificContentAssistAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SpecificContentAssistAction.java @@ -14,6 +14,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.editor; +import org.eclipse.cdt.internal.ui.text.contentassist.CompletionProposalCategory; +import org.eclipse.cdt.internal.ui.text.contentassist.CompletionProposalComputerRegistry; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.action.Action; import org.eclipse.jface.text.BadLocationException; @@ -28,11 +31,6 @@ import org.eclipse.ui.texteditor.IDocumentProvider; import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.IUpdate; -import org.eclipse.cdt.ui.text.ICPartitions; - -import org.eclipse.cdt.internal.ui.text.contentassist.CompletionProposalCategory; -import org.eclipse.cdt.internal.ui.text.contentassist.CompletionProposalComputerRegistry; - /** * Action to run content assist on a specific proposal category. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SpecificContentAssistExecutor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SpecificContentAssistExecutor.java index 124e1c9c4c2..d02e24056b5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SpecificContentAssistExecutor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SpecificContentAssistExecutor.java @@ -17,14 +17,13 @@ package org.eclipse.cdt.internal.ui.editor; import java.util.Collection; import java.util.Iterator; +import org.eclipse.cdt.internal.ui.text.contentassist.CompletionProposalCategory; +import org.eclipse.cdt.internal.ui.text.contentassist.CompletionProposalComputerRegistry; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.text.ITextOperationTarget; import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.internal.ui.text.contentassist.CompletionProposalCategory; -import org.eclipse.cdt.internal.ui.text.contentassist.CompletionProposalComputerRegistry; - /** * A content assist executor can invoke content assist for a specific proposal category on an editor. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleCommentAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleCommentAction.java index 734c65bb502..b3f9a8ef0e9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleCommentAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleCommentAction.java @@ -18,6 +18,7 @@ import java.util.HashMap; import java.util.Map; import java.util.ResourceBundle; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; @@ -38,8 +39,6 @@ import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.ResourceAction; import org.eclipse.ui.texteditor.TextEditorAction; -import org.eclipse.cdt.ui.CUIPlugin; - /** * An action which toggles comment prefixes on the selected lines. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleMarkOccurrencesAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleMarkOccurrencesAction.java index 7845e35bd9c..5b5a3f3ee6e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleMarkOccurrencesAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleMarkOccurrencesAction.java @@ -14,6 +14,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.editor; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.jface.action.IAction; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.util.IPropertyChangeListener; @@ -22,12 +26,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.TextEditorAction; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; - -import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; - /** * A toolbar action which toggles the * {@linkplain org.eclipse.cdt.ui.PreferenceConstants#EDITOR_MARK_OCCURRENCES mark occurrences preference}. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TogglePresentationAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TogglePresentationAction.java index f23f095a228..6812dad0252 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TogglePresentationAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TogglePresentationAction.java @@ -21,7 +21,6 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; - import org.eclipse.ui.PlatformUI; import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleSourceAndHeaderAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleSourceAndHeaderAction.java index 4bbdd5c430a..c8f61d1eaad 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleSourceAndHeaderAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleSourceAndHeaderAction.java @@ -16,19 +16,17 @@ package org.eclipse.cdt.internal.ui.editor; import java.util.ResourceBundle; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.ui.texteditor.TextEditorAction; - import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.cdt.internal.ui.util.EditorUtility; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.IWorkingCopyManager; - -import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.texteditor.ITextEditor; +import org.eclipse.ui.texteditor.TextEditorAction; /** * Editor action to toggle between source and header files. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TranslationUnitAnnotationModelEvent.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TranslationUnitAnnotationModelEvent.java index 1c6a9045196..752e74ca136 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TranslationUnitAnnotationModelEvent.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TranslationUnitAnnotationModelEvent.java @@ -18,12 +18,10 @@ import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; - import org.eclipse.jface.text.Position; import org.eclipse.jface.text.source.Annotation; import org.eclipse.jface.text.source.AnnotationModelEvent; import org.eclipse.jface.text.source.IAnnotationModel; - import org.eclipse.ui.texteditor.MarkerAnnotation; /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/WorkingCopyManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/WorkingCopyManager.java index 860e03ce181..66166a201d7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/WorkingCopyManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/WorkingCopyManager.java @@ -16,20 +16,18 @@ package org.eclipse.cdt.internal.ui.editor; import java.util.HashMap; import java.util.Map; -import org.eclipse.core.runtime.Assert; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.ui.IEditorInput; - import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.IProblemRequestor; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.ui.IWorkingCopyManager; -import org.eclipse.cdt.ui.IWorkingCopyManagerExtension; - import org.eclipse.cdt.internal.core.model.CModelManager; import org.eclipse.cdt.internal.core.model.IBufferFactory; +import org.eclipse.cdt.ui.IWorkingCopyManager; +import org.eclipse.cdt.ui.IWorkingCopyManagerExtension; +import org.eclipse.core.runtime.Assert; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.ui.IEditorInput; /** * This working copy manager works together with a given compilation unit document provider and diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/ASMEditorActionContributor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/ASMEditorActionContributor.java index c1f49f9000c..9bb4b747881 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/ASMEditorActionContributor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/ASMEditorActionContributor.java @@ -13,14 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.editor.asm; +import org.eclipse.cdt.internal.ui.editor.TogglePresentationAction; import org.eclipse.ui.IActionBars; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.editors.text.TextEditorActionContributor; import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds; -import org.eclipse.cdt.internal.ui.editor.TogglePresentationAction; - public class ASMEditorActionContributor extends TextEditorActionContributor { private TogglePresentationAction fTogglePresentation; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmCodeScanner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmCodeScanner.java index 3d80ed03839..aea4b0541d2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmCodeScanner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmCodeScanner.java @@ -19,19 +19,17 @@ package org.eclipse.cdt.internal.ui.editor.asm; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.core.model.IAsmLanguage; +import org.eclipse.cdt.internal.ui.text.CWhitespaceRule; +import org.eclipse.cdt.ui.text.AbstractCScanner; +import org.eclipse.cdt.ui.text.ICColorConstants; +import org.eclipse.cdt.ui.text.ITokenStoreFactory; import org.eclipse.jface.text.rules.EndOfLineRule; import org.eclipse.jface.text.rules.IRule; import org.eclipse.jface.text.rules.IToken; import org.eclipse.jface.text.rules.WordPatternRule; import org.eclipse.jface.text.rules.WordRule; -import org.eclipse.cdt.core.model.IAsmLanguage; -import org.eclipse.cdt.ui.text.AbstractCScanner; -import org.eclipse.cdt.ui.text.ICColorConstants; -import org.eclipse.cdt.ui.text.ITokenStoreFactory; - -import org.eclipse.cdt.internal.ui.text.CWhitespaceRule; - /* * An assembly code scanner. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmContentOutlinePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmContentOutlinePage.java index 32ebaa80fa0..dca0b5e0cda 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmContentOutlinePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmContentOutlinePage.java @@ -13,13 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.editor.asm; -import org.eclipse.ui.actions.ActionGroup; -import org.eclipse.ui.texteditor.ITextEditor; - +import org.eclipse.cdt.internal.ui.editor.AbstractCModelOutlinePage; import org.eclipse.cdt.ui.actions.CustomFiltersActionGroup; import org.eclipse.cdt.ui.actions.OpenViewActionGroup; - -import org.eclipse.cdt.internal.ui.editor.AbstractCModelOutlinePage; +import org.eclipse.ui.actions.ActionGroup; +import org.eclipse.ui.texteditor.ITextEditor; /** * Content outline page for assembly translation units. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmDocumentSetupParticipant.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmDocumentSetupParticipant.java index ae102e42647..a7adc2cc34f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmDocumentSetupParticipant.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmDocumentSetupParticipant.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.editor.asm; +import org.eclipse.cdt.ui.CDTUITools; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.core.filebuffers.IDocumentSetupParticipant; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; @@ -21,9 +23,6 @@ import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IDocumentExtension3; import org.eclipse.jface.text.IDocumentPartitioner; -import org.eclipse.cdt.ui.CDTUITools; -import org.eclipse.cdt.ui.text.ICPartitions; - /** * Document setup participant for asesembly content. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmPreprocessorScanner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmPreprocessorScanner.java index 14561e63752..cfe6a007d15 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmPreprocessorScanner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmPreprocessorScanner.java @@ -17,19 +17,18 @@ package org.eclipse.cdt.internal.ui.editor.asm; import java.util.ArrayList; import java.util.List; -import org.eclipse.core.runtime.Assert; -import org.eclipse.jface.text.rules.EndOfLineRule; -import org.eclipse.jface.text.rules.IRule; -import org.eclipse.jface.text.rules.IToken; import org.eclipse.cdt.core.model.IAsmLanguage; -import org.eclipse.cdt.ui.text.AbstractCScanner; -import org.eclipse.cdt.ui.text.ICColorConstants; -import org.eclipse.cdt.ui.text.ITokenStoreFactory; - import org.eclipse.cdt.internal.ui.text.CHeaderRule; import org.eclipse.cdt.internal.ui.text.CWhitespaceRule; import org.eclipse.cdt.internal.ui.text.PreprocessorRule; import org.eclipse.cdt.internal.ui.text.util.CWordDetector; +import org.eclipse.cdt.ui.text.AbstractCScanner; +import org.eclipse.cdt.ui.text.ICColorConstants; +import org.eclipse.cdt.ui.text.ITokenStoreFactory; +import org.eclipse.core.runtime.Assert; +import org.eclipse.jface.text.rules.EndOfLineRule; +import org.eclipse.jface.text.rules.IRule; +import org.eclipse.jface.text.rules.IToken; /** * A preprocessor directive scanner for Asm source. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmReconcilingStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmReconcilingStrategy.java index 18967e2dc3d..969bf56dc6a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmReconcilingStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmReconcilingStrategy.java @@ -13,6 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.editor.asm; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.IWorkingCopyManager; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.OperationCanceledException; @@ -24,11 +28,6 @@ import org.eclipse.jface.text.reconciler.IReconcilingStrategy; import org.eclipse.jface.text.reconciler.IReconcilingStrategyExtension; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.IWorkingCopyManager; - /** * Reconciling strategy for assembly translation units. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextEditor.java index f233c6f462b..37497bb74cd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextEditor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextEditor.java @@ -17,6 +17,24 @@ package org.eclipse.cdt.internal.ui.editor.asm; import java.util.Iterator; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ISourceRange; +import org.eclipse.cdt.core.model.ISourceReference; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.cdt.internal.ui.IContextMenuConstants; +import org.eclipse.cdt.internal.ui.editor.AbstractCModelOutlinePage; +import org.eclipse.cdt.internal.ui.editor.CAnnotationIterator; +import org.eclipse.cdt.internal.ui.editor.ICAnnotation; +import org.eclipse.cdt.ui.CDTUITools; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.ICModelBasedEditor; +import org.eclipse.cdt.ui.IWorkingCopyManager; +import org.eclipse.cdt.ui.actions.OpenViewActionGroup; +import org.eclipse.cdt.ui.text.AsmSourceViewerConfiguration; +import org.eclipse.cdt.ui.text.ICPartitions; +import org.eclipse.cdt.ui.text.IColorManager; import org.eclipse.jface.action.GroupMarker; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IStatusLineManager; @@ -51,26 +69,6 @@ import org.eclipse.ui.part.EditorActionBarContributor; import org.eclipse.ui.texteditor.ITextEditorActionConstants; import org.eclipse.ui.views.contentoutline.IContentOutlinePage; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ISourceRange; -import org.eclipse.cdt.core.model.ISourceReference; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.ui.CDTUITools; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.ICModelBasedEditor; -import org.eclipse.cdt.ui.IWorkingCopyManager; -import org.eclipse.cdt.ui.actions.OpenViewActionGroup; -import org.eclipse.cdt.ui.text.AsmSourceViewerConfiguration; -import org.eclipse.cdt.ui.text.ICPartitions; -import org.eclipse.cdt.ui.text.IColorManager; - -import org.eclipse.cdt.internal.ui.IContextMenuConstants; -import org.eclipse.cdt.internal.ui.editor.AbstractCModelOutlinePage; -import org.eclipse.cdt.internal.ui.editor.CAnnotationIterator; -import org.eclipse.cdt.internal.ui.editor.ICAnnotation; - /** * Assembly text editor. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextTools.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextTools.java index 613e99914a8..8a687947b49 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextTools.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextTools.java @@ -16,25 +16,23 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.editor.asm; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.text.IDocumentPartitioner; -import org.eclipse.jface.text.rules.FastPartitioner; -import org.eclipse.jface.text.rules.RuleBasedScanner; -import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; - import org.eclipse.cdt.core.model.AssemblyLanguage; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.ICColorConstants; -import org.eclipse.cdt.ui.text.ICPartitions; -import org.eclipse.cdt.ui.text.ITokenStore; -import org.eclipse.cdt.ui.text.ITokenStoreFactory; - import org.eclipse.cdt.internal.ui.text.CCommentScanner; import org.eclipse.cdt.internal.ui.text.SingleTokenCScanner; import org.eclipse.cdt.internal.ui.text.TokenStore; import org.eclipse.cdt.internal.ui.text.asm.AsmPartitionScanner; import org.eclipse.cdt.internal.ui.text.util.CColorManager; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.ICColorConstants; +import org.eclipse.cdt.ui.text.ICPartitions; +import org.eclipse.cdt.ui.text.ITokenStore; +import org.eclipse.cdt.ui.text.ITokenStoreFactory; +import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.jface.text.IDocumentPartitioner; +import org.eclipse.jface.text.rules.FastPartitioner; +import org.eclipse.jface.text.rules.RuleBasedScanner; +import org.eclipse.jface.util.IPropertyChangeListener; +import org.eclipse.jface.util.PropertyChangeEvent; /** * This type shares all scanners and the color manager between diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/expressions/CPropertyTester.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/expressions/CPropertyTester.java index c9c28004c27..9ca78860247 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/expressions/CPropertyTester.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/expressions/CPropertyTester.java @@ -17,14 +17,13 @@ package org.eclipse.cdt.internal.ui.expressions; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.core.expressions.PropertyTester; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.preferences.IPreferencesService; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ITranslationUnit; - /** * Property tester to test expressions in plugin.xml. Tests following expressions: * 1. Checks whether given object is a source file. Usage: diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/AnonymousStructFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/AnonymousStructFilter.java index 0d779cc5e21..d1b5245f2c1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/AnonymousStructFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/AnonymousStructFilter.java @@ -13,12 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.filters; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.viewers.ViewerFilter; - import org.eclipse.cdt.internal.core.model.CElement; import org.eclipse.cdt.internal.core.model.Enumeration; import org.eclipse.cdt.internal.core.model.Structure; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.viewers.ViewerFilter; /** * Filters out anonymous structs and enums. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ArchiveFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ArchiveFilter.java index 21a66450f72..e2a57afe068 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ArchiveFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ArchiveFilter.java @@ -15,7 +15,6 @@ package org.eclipse.cdt.internal.ui.filters; import org.eclipse.cdt.core.model.IArchive; import org.eclipse.cdt.core.model.IArchiveContainer; - import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ClosedProjectFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ClosedProjectFilter.java index 1a7f4c1a90f..36241e660ee 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ClosedProjectFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ClosedProjectFilter.java @@ -13,12 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.filters; +import org.eclipse.cdt.core.model.ICElement; import org.eclipse.core.resources.IResource; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; -import org.eclipse.cdt.core.model.ICElement; - /** * Filters closed projects */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/CustomFiltersDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/CustomFiltersDialog.java index 70a464ef5cf..bf6d5fabc3a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/CustomFiltersDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/CustomFiltersDialog.java @@ -22,6 +22,8 @@ import java.util.Set; import java.util.Stack; import java.util.StringTokenizer; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.util.SWTUtil; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.viewers.ArrayContentProvider; @@ -52,9 +54,6 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.SelectionDialog; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.util.SWTUtil; - public class CustomFiltersDialog extends SelectionDialog { private static final String SEPARATOR = ","; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ExecutableFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ExecutableFilter.java index e958fb7167a..15ec30e5404 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ExecutableFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ExecutableFilter.java @@ -15,7 +15,6 @@ package org.eclipse.cdt.internal.ui.filters; import org.eclipse.cdt.core.model.IBinary; import org.eclipse.cdt.core.model.IBinaryContainer; - import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/FilterDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/FilterDescriptor.java index e4e364383d9..999f1c14754 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/FilterDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/FilterDescriptor.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.filters; -import com.ibm.icu.text.Collator; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtensionRegistry; @@ -29,7 +29,7 @@ import org.eclipse.jface.util.SafeRunnable; import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.osgi.util.NLS; -import org.eclipse.cdt.ui.CUIPlugin; +import com.ibm.icu.text.Collator; /** * Represents a custom filter which is provided by the diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ForwardDeclarationFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ForwardDeclarationFilter.java index 61e9f431889..31a0e28dd2c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ForwardDeclarationFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ForwardDeclarationFilter.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.filters; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.viewers.ViewerFilter; - import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.viewers.ViewerFilter; /** * Filter for forward declarations diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NamePatternFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NamePatternFilter.java index 7b335835475..092862301cf 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NamePatternFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NamePatternFilter.java @@ -17,7 +17,6 @@ import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.internal.ui.util.StringMatcher; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IAdaptable; - import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NonCElementFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NonCElementFilter.java index 211c82a7b15..a72355be91d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NonCElementFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NonCElementFilter.java @@ -19,7 +19,6 @@ import org.eclipse.cdt.core.model.ICElement; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IStorage; - import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NonCProjectsFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NonCProjectsFilter.java index 096d47d8c02..acafecc43ac 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NonCProjectsFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NonCProjectsFilter.java @@ -14,13 +14,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.filters; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICProject; import org.eclipse.core.resources.IProject; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICProject; - /** * Filters (open) non-C projects. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ObjectFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ObjectFilter.java index f6c9df70995..5ecb69ff35a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ObjectFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ObjectFilter.java @@ -15,7 +15,6 @@ package org.eclipse.cdt.internal.ui.filters; import org.eclipse.cdt.core.model.IBinary; import org.eclipse.cdt.core.model.IBinaryContainer; - import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/SharedFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/SharedFilter.java index 2d688b4d278..03d62a6d44c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/SharedFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/SharedFilter.java @@ -15,7 +15,6 @@ package org.eclipse.cdt.internal.ui.filters; import org.eclipse.cdt.core.model.IBinary; import org.eclipse.cdt.core.model.IBinaryContainer; - import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CFunctionSummary.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CFunctionSummary.java index a01606fbee8..8ba53f9bde4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CFunctionSummary.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CFunctionSummary.java @@ -15,13 +15,12 @@ package org.eclipse.cdt.internal.ui.help; import java.util.ArrayList; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - import org.eclipse.cdt.ui.FunctionPrototypeSummary; import org.eclipse.cdt.ui.IFunctionSummary; import org.eclipse.cdt.ui.IRequiredInclude; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; public class CFunctionSummary implements IFunctionSummary { private static final String ATTR_STD = "standard"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpBook.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpBook.java index 31a2276a7bf..3f3434d4c95 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpBook.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpBook.java @@ -19,15 +19,14 @@ import java.util.List; import java.util.SortedMap; import java.util.TreeMap; -import org.eclipse.help.IHelpResource; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - import org.eclipse.cdt.ui.ICHelpBook; import org.eclipse.cdt.ui.ICHelpResourceDescriptor; import org.eclipse.cdt.ui.IFunctionSummary; import org.eclipse.cdt.ui.text.ICHelpInvocationContext; +import org.eclipse.help.IHelpResource; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; public class CHelpBook implements ICHelpBook { private static final String ATTR_TITLE = "title"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpEntry.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpEntry.java index 4484e828a39..c15ccbdeead 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpEntry.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpEntry.java @@ -15,13 +15,12 @@ package org.eclipse.cdt.internal.ui.help; import java.util.ArrayList; +import org.eclipse.cdt.ui.IFunctionSummary; import org.eclipse.help.IHelpResource; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.eclipse.cdt.ui.IFunctionSummary; - public class CHelpEntry { private static final String ATTR_KEYWD = "keyword"; //$NON-NLS-1$ private static final String NODE_TOPIC = "topic"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpProvider.java index 22f0c25db92..1170bc2d1d0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpProvider.java @@ -26,6 +26,11 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; +import org.eclipse.cdt.ui.ICHelpBook; +import org.eclipse.cdt.ui.ICHelpProvider; +import org.eclipse.cdt.ui.ICHelpResourceDescriptor; +import org.eclipse.cdt.ui.IFunctionSummary; +import org.eclipse.cdt.ui.text.ICHelpInvocationContext; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtension; @@ -39,12 +44,6 @@ import org.w3c.dom.NodeList; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import org.eclipse.cdt.ui.ICHelpBook; -import org.eclipse.cdt.ui.ICHelpProvider; -import org.eclipse.cdt.ui.ICHelpResourceDescriptor; -import org.eclipse.cdt.ui.IFunctionSummary; -import org.eclipse.cdt.ui.text.ICHelpInvocationContext; - public class CHelpProvider implements ICHelpProvider { private static final String EXTENSION_POINT_ID = "org.eclipse.cdt.ui.HelpInfo"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBContentProvider.java index 7599af9643f..a31f3a15df0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBContentProvider.java @@ -18,11 +18,6 @@ import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Set; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.swt.widgets.Display; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.index.IIndexFile; @@ -32,9 +27,12 @@ import org.eclipse.cdt.core.index.IIndexManager; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.ui.viewsupport.AsyncTreeContentProvider; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.swt.widgets.Display; /** * This is the content provider for the include browser. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBConversions.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBConversions.java index 5a6b43c271c..21dda2df7a5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBConversions.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBConversions.java @@ -16,6 +16,10 @@ package org.eclipse.cdt.internal.ui.includebrowser; import java.util.ArrayList; import java.util.Iterator; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.CoreModelUtil; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IPath; @@ -24,11 +28,6 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.ui.editors.text.ILocationProvider; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.CoreModelUtil; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; - public class IBConversions { public static IBNode selectionToNode(ISelection sel) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBDragSourceListener.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBDragSourceListener.java index 38a7c648c02..06dcdfa3a42 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBDragSourceListener.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBDragSourceListener.java @@ -16,6 +16,8 @@ package org.eclipse.cdt.internal.ui.includebrowser; import java.util.ArrayList; import java.util.Iterator; +import org.eclipse.cdt.core.index.IIndexFileLocation; +import org.eclipse.cdt.core.index.IndexLocationFactory; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IPath; import org.eclipse.jface.viewers.IStructuredSelection; @@ -25,9 +27,6 @@ import org.eclipse.swt.dnd.DragSourceListener; import org.eclipse.swt.dnd.FileTransfer; import org.eclipse.ui.part.ResourceTransfer; -import org.eclipse.cdt.core.index.IIndexFileLocation; -import org.eclipse.cdt.core.index.IndexLocationFactory; - public class IBDragSourceListener implements DragSourceListener { private TreeViewer fTreeViewer; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBDropTargetListener.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBDropTargetListener.java index 65e10da432a..d816aa88af2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBDropTargetListener.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBDropTargetListener.java @@ -16,6 +16,9 @@ package org.eclipse.cdt.internal.ui.includebrowser; import java.util.Iterator; +import org.eclipse.cdt.core.model.CoreModelUtil; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.core.resources.ResourceLookup; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.Path; @@ -31,11 +34,6 @@ import org.eclipse.swt.dnd.TransferData; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.part.ResourceTransfer; -import org.eclipse.cdt.core.model.CoreModelUtil; -import org.eclipse.cdt.core.model.ITranslationUnit; - -import org.eclipse.cdt.internal.core.resources.ResourceLookup; - public class IBDropTargetListener implements DropTargetListener { private IBViewPart fIncludeBrowser; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBFile.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBFile.java index 2dc10e45e9a..100f09466c6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBFile.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBFile.java @@ -17,16 +17,15 @@ package org.eclipse.cdt.internal.ui.includebrowser; import java.util.Objects; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; - import org.eclipse.cdt.core.index.IIndexFileLocation; import org.eclipse.cdt.core.index.IndexLocationFactory; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CoreModelUtil; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourcesPlugin; public class IBFile { final public ITranslationUnit fTU; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryAction.java index 8f84d7603f4..6c9ec0d5289 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryAction.java @@ -14,13 +14,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.includebrowser; -import org.eclipse.jface.action.Action; -import org.eclipse.jface.resource.ImageDescriptor; - import org.eclipse.cdt.core.model.ITranslationUnit; - -import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; +import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ImageDescriptor; /** * Action used for the include browser forward / backward buttons diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryDropDownAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryDropDownAction.java index 600d89ed695..95aa8cbe2d0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryDropDownAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryDropDownAction.java @@ -14,6 +14,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.includebrowser; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.CPluginImages; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.ActionContributionItem; import org.eclipse.jface.action.IMenuCreator; @@ -22,10 +24,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.MenuItem; -import org.eclipse.cdt.core.model.ITranslationUnit; - -import org.eclipse.cdt.internal.ui.CPluginImages; - public class IBHistoryDropDownAction extends Action implements IMenuCreator { public static class ClearHistoryAction extends Action { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryListAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryListAction.java index 8c566e896d7..8ab41797e34 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryListAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryListAction.java @@ -17,6 +17,15 @@ package org.eclipse.cdt.internal.ui.includebrowser; import java.util.Arrays; import java.util.List; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; +import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; +import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.action.Action; import org.eclipse.jface.dialogs.StatusDialog; @@ -30,17 +39,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; - -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; -import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; - public class IBHistoryListAction extends Action { private class HistoryListDialog extends StatusDialog { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBLabelProvider.java index f8645da6f1a..b6023892642 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBLabelProvider.java @@ -16,6 +16,11 @@ package org.eclipse.cdt.internal.ui.includebrowser; import java.util.HashMap; import java.util.Iterator; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.viewsupport.ImageImageDescriptor; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CElementImageDescriptor; +import org.eclipse.cdt.ui.CElementLabelProvider; import org.eclipse.core.runtime.IPath; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IColorProvider; @@ -26,13 +31,6 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.widgets.Display; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CElementImageDescriptor; -import org.eclipse.cdt.ui.CElementLabelProvider; - -import org.eclipse.cdt.internal.ui.viewsupport.ImageImageDescriptor; - public class IBLabelProvider extends LabelProvider implements IColorProvider { private CElementLabelProvider fCLabelProvider = new CElementLabelProvider(); private Color fColorInactive; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBNode.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBNode.java index ad1bcf582e7..aed187374e2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBNode.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBNode.java @@ -15,14 +15,13 @@ package org.eclipse.cdt.internal.ui.includebrowser; import java.util.Objects; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IPath; - import org.eclipse.cdt.core.index.IIndexFileLocation; import org.eclipse.cdt.core.index.IndexLocationFactory; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IPath; /** * Represents a node in the include browser diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBSetInputJob.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBSetInputJob.java index aa4dd516bd2..0639739921d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBSetInputJob.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBSetInputJob.java @@ -14,6 +14,9 @@ package org.eclipse.cdt.internal.ui.includebrowser; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.index.IIndexManager; +import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -21,10 +24,6 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.swt.SWTException; import org.eclipse.swt.widgets.Display; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.index.IIndexManager; -import org.eclipse.cdt.core.model.ITranslationUnit; - public class IBSetInputJob extends Job { private ITranslationUnit fInput; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java index e8f064d14c8..8156f731c12 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java @@ -19,6 +19,31 @@ package org.eclipse.cdt.internal.ui.includebrowser; import java.util.ArrayList; import java.util.Arrays; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.index.IIndexFileLocation; +import org.eclipse.cdt.core.index.IIndexManager; +import org.eclipse.cdt.core.index.IndexLocationFactory; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.CoreModelUtil; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.actions.CollapseAllAction; +import org.eclipse.cdt.internal.ui.actions.CopyTreeAction; +import org.eclipse.cdt.internal.ui.actions.ExpandAllAction; +import org.eclipse.cdt.internal.ui.navigator.OpenCElementAction; +import org.eclipse.cdt.internal.ui.util.Messages; +import org.eclipse.cdt.internal.ui.viewsupport.EditorOpener; +import org.eclipse.cdt.internal.ui.viewsupport.ExtendedTreeViewer; +import org.eclipse.cdt.internal.ui.viewsupport.IndexUI; +import org.eclipse.cdt.internal.ui.viewsupport.TreeNavigator; +import org.eclipse.cdt.internal.ui.viewsupport.WorkingSetFilterUI; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; @@ -89,33 +114,6 @@ import org.eclipse.ui.part.ResourceTransfer; import org.eclipse.ui.part.ShowInContext; import org.eclipse.ui.part.ViewPart; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.index.IIndex; -import org.eclipse.cdt.core.index.IIndexFileLocation; -import org.eclipse.cdt.core.index.IIndexManager; -import org.eclipse.cdt.core.index.IndexLocationFactory; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.CoreModelUtil; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.actions.CollapseAllAction; -import org.eclipse.cdt.internal.ui.actions.CopyTreeAction; -import org.eclipse.cdt.internal.ui.actions.ExpandAllAction; -import org.eclipse.cdt.internal.ui.navigator.OpenCElementAction; -import org.eclipse.cdt.internal.ui.util.Messages; -import org.eclipse.cdt.internal.ui.viewsupport.EditorOpener; -import org.eclipse.cdt.internal.ui.viewsupport.ExtendedTreeViewer; -import org.eclipse.cdt.internal.ui.viewsupport.IndexUI; -import org.eclipse.cdt.internal.ui.viewsupport.TreeNavigator; -import org.eclipse.cdt.internal.ui.viewsupport.WorkingSetFilterUI; - /** * The view part for the include browser. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBWorkingSetFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBWorkingSetFilter.java index 7bcbdb0f35e..b8050035333 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBWorkingSetFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBWorkingSetFilter.java @@ -14,12 +14,11 @@ package org.eclipse.cdt.internal.ui.includebrowser; +import org.eclipse.cdt.internal.ui.viewsupport.WorkingSetFilterUI; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.ui.IWorkingSet; -import org.eclipse.cdt.internal.ui.viewsupport.WorkingSetFilterUI; - public class IBWorkingSetFilter extends ViewerFilter { private WorkingSetFilterUI fWorkingSetFilter; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IncludeBrowserUI.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IncludeBrowserUI.java index affbe75d1a7..1253b089fcc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IncludeBrowserUI.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IncludeBrowserUI.java @@ -15,12 +15,6 @@ package org.eclipse.cdt.internal.ui.includebrowser; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.texteditor.ITextEditor; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.index.IIndexFileLocation; @@ -32,10 +26,14 @@ import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.IInclude; import org.eclipse.cdt.core.model.ISourceReference; import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.ui.util.ExceptionHandler; import org.eclipse.cdt.internal.ui.viewsupport.IndexUI; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.texteditor.ITextEditor; public class IncludeBrowserUI { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/OpenIncludeBrowserAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/OpenIncludeBrowserAction.java index 6d3371fb948..13306339d94 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/OpenIncludeBrowserAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/OpenIncludeBrowserAction.java @@ -14,17 +14,16 @@ package org.eclipse.cdt.internal.ui.includebrowser; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ISourceReference; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.actions.SelectionDispatchAction; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.text.ITextSelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.IWorkbenchSite; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ISourceReference; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.actions.SelectionDispatchAction; - public class OpenIncludeBrowserAction extends SelectionDispatchAction { private ITextEditor fEditor; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/CountNodeAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/CountNodeAction.java index 386a5db602e..a469793279a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/CountNodeAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/CountNodeAction.java @@ -14,17 +14,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.indexview; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.TreeViewer; - import org.eclipse.cdt.core.dom.IPDOMNode; import org.eclipse.cdt.core.dom.IPDOMVisitor; import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.core.CCoreInternals; import org.eclipse.cdt.internal.core.pdom.IPDOM; import org.eclipse.cdt.internal.core.pdom.PDOM; @@ -34,6 +26,12 @@ import org.eclipse.cdt.internal.core.pdom.dom.PDOMBinding; import org.eclipse.cdt.internal.core.pdom.dom.PDOMFile; import org.eclipse.cdt.internal.core.pdom.dom.PDOMMacro; import org.eclipse.cdt.internal.core.pdom.dom.PDOMName; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.TreeViewer; /** * @author dschaefer diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindDeclarationsAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindDeclarationsAction.java index 02609cdf4c8..0d9eb84c392 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindDeclarationsAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindDeclarationsAction.java @@ -15,17 +15,15 @@ package org.eclipse.cdt.internal.ui.indexview; +import org.eclipse.cdt.core.index.IIndexBinding; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.internal.ui.search.CSearchQuery; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.search.ui.NewSearchUI; -import org.eclipse.cdt.core.index.IIndexBinding; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.search.CSearchQuery; - /** * @author Doug Schaefer * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindReferencesAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindReferencesAction.java index 3452423e38d..748d45411d2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindReferencesAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindReferencesAction.java @@ -15,10 +15,9 @@ package org.eclipse.cdt.internal.ui.indexview; -import org.eclipse.cdt.internal.ui.search.CSearchQuery; - import org.eclipse.cdt.core.index.IIndexBinding; import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.internal.ui.search.CSearchQuery; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexLabelProvider.java index c0da10f5cee..c4e00c55145 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexLabelProvider.java @@ -17,13 +17,6 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.indexview; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.swt.graphics.Image; -import org.eclipse.ui.ISharedImages; -import org.eclipse.ui.PlatformUI; - import org.eclipse.cdt.core.dom.IPDOMNode; import org.eclipse.cdt.core.dom.ast.ASTTypeUtil; import org.eclipse.cdt.core.dom.ast.ICompositeType; @@ -42,14 +35,18 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateInstance; import org.eclipse.cdt.core.model.ICContainer; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPDeferredClassInstance; import org.eclipse.cdt.internal.core.pdom.dom.PDOMLinkage; import org.eclipse.cdt.internal.core.pdom.dom.PDOMNamedNode; - import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.swt.graphics.Image; +import org.eclipse.ui.ISharedImages; +import org.eclipse.ui.PlatformUI; /** * Common label provider for index based viewers. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexNode.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexNode.java index 3ea2a8d51b6..16bf937462f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexNode.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexNode.java @@ -14,10 +14,9 @@ package org.eclipse.cdt.internal.ui.indexview; -import org.eclipse.swt.graphics.Image; - import org.eclipse.cdt.core.dom.IPDOMNode; import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.swt.graphics.Image; class IndexNode { Object fParent; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexView.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexView.java index 48a6c0ec067..8dfde297732 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexView.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexView.java @@ -20,6 +20,27 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import org.eclipse.cdt.core.dom.IPDOMNode; +import org.eclipse.cdt.core.dom.IPDOMVisitor; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.index.IIndexName; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ElementChangedEvent; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICElementDelta; +import org.eclipse.cdt.core.model.ICModel; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.IElementChangedListener; +import org.eclipse.cdt.internal.core.CCoreInternals; +import org.eclipse.cdt.internal.core.pdom.IPDOM; +import org.eclipse.cdt.internal.core.pdom.PDOM; +import org.eclipse.cdt.internal.core.pdom.dom.PDOMBinding; +import org.eclipse.cdt.internal.core.pdom.dom.PDOMLinkage; +import org.eclipse.cdt.internal.core.pdom.dom.PDOMNode; +import org.eclipse.cdt.internal.ui.viewsupport.AsyncTreeContentProvider; +import org.eclipse.cdt.internal.ui.viewsupport.ExtendedTreeViewer; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.action.IMenuListener; @@ -42,30 +63,6 @@ import org.eclipse.ui.IActionBars; import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.part.ViewPart; -import org.eclipse.cdt.core.dom.IPDOMNode; -import org.eclipse.cdt.core.dom.IPDOMVisitor; -import org.eclipse.cdt.core.index.IIndex; -import org.eclipse.cdt.core.index.IIndexName; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ElementChangedEvent; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICElementDelta; -import org.eclipse.cdt.core.model.ICModel; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.IElementChangedListener; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.core.CCoreInternals; -import org.eclipse.cdt.internal.core.pdom.IPDOM; -import org.eclipse.cdt.internal.core.pdom.PDOM; -import org.eclipse.cdt.internal.core.pdom.dom.PDOMBinding; -import org.eclipse.cdt.internal.core.pdom.dom.PDOMLinkage; -import org.eclipse.cdt.internal.core.pdom.dom.PDOMNode; - -import org.eclipse.cdt.internal.ui.viewsupport.AsyncTreeContentProvider; -import org.eclipse.cdt.internal.ui.viewsupport.ExtendedTreeViewer; - /** * @author Doug Schaefer * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexViewSearchQuery.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexViewSearchQuery.java index 1fc399b4815..52856187acf 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexViewSearchQuery.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexViewSearchQuery.java @@ -15,21 +15,18 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.indexview; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.Status; - import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.index.IIndexBinding; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.core.CCoreInternals; - import org.eclipse.cdt.internal.ui.search.CSearchQuery; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.core.runtime.Status; /** * @author Doug Schaefer diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/OpenDefinitionAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/OpenDefinitionAction.java index cc4b261b28d..04b93a7c4b0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/OpenDefinitionAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/OpenDefinitionAction.java @@ -15,17 +15,6 @@ package org.eclipse.cdt.internal.ui.indexview; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.texteditor.ITextEditor; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.index.IIndexBinding; @@ -35,11 +24,19 @@ import org.eclipse.cdt.core.index.IndexLocationFactory; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.core.CCoreInternals; - import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.texteditor.ITextEditor; /** * @author Doug Schaefer diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ContentTypeMappingDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ContentTypeMappingDialog.java index 16a04489d7f..852f0f1a1d3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ContentTypeMappingDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ContentTypeMappingDialog.java @@ -18,17 +18,15 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.LanguageManager; +import org.eclipse.cdt.internal.ui.preferences.PreferencesMessages; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.LanguageManager; - -import org.eclipse.cdt.internal.ui.preferences.PreferencesMessages; - public abstract class ContentTypeMappingDialog extends Dialog { Combo fContentType; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/FileLanguageMappingPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/FileLanguageMappingPropertyPage.java index 6ff3df9088c..56f2a8fa273 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/FileLanguageMappingPropertyPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/FileLanguageMappingPropertyPage.java @@ -17,6 +17,19 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; +import org.eclipse.cdt.core.language.ProjectLanguageConfiguration; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.LanguageManager; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.internal.core.CContentTypes; +import org.eclipse.cdt.internal.core.Util; +import org.eclipse.cdt.internal.core.language.LanguageMapping; +import org.eclipse.cdt.internal.core.language.LanguageMappingResolver; +import org.eclipse.cdt.internal.ui.preferences.PreferencesMessages; +import org.eclipse.cdt.internal.ui.util.Messages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; @@ -42,22 +55,6 @@ import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; import org.eclipse.ui.dialogs.PropertyPage; -import org.eclipse.cdt.core.language.ProjectLanguageConfiguration; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.LanguageManager; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.core.CContentTypes; -import org.eclipse.cdt.internal.core.Util; -import org.eclipse.cdt.internal.core.language.LanguageMapping; -import org.eclipse.cdt.internal.core.language.LanguageMappingResolver; - -import org.eclipse.cdt.internal.ui.preferences.PreferencesMessages; -import org.eclipse.cdt.internal.ui.util.Messages; - public class FileLanguageMappingPropertyPage extends PropertyPage { private static final int MINIMUM_COLUMN_WIDTH = 150; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/LanguageMappingWidget.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/LanguageMappingWidget.java index 2f6bd14625f..f3fb938ff1f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/LanguageMappingWidget.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/LanguageMappingWidget.java @@ -18,6 +18,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Set; +import org.eclipse.cdt.core.model.LanguageManager; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.content.IContentType; @@ -30,8 +31,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Link; import org.eclipse.swt.widgets.Table; -import org.eclipse.cdt.core.model.LanguageManager; - public abstract class LanguageMappingWidget { protected static final int MINIMUM_COLUMN_WIDTH = 150; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/LanguageVerifier.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/LanguageVerifier.java index ca70ec47840..84750c2389f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/LanguageVerifier.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/LanguageVerifier.java @@ -18,10 +18,10 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; -import java.util.Map.Entry; import org.eclipse.cdt.core.language.ProjectLanguageConfiguration; import org.eclipse.cdt.core.language.WorkspaceLanguageConfiguration; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectContentTypeMappingDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectContentTypeMappingDialog.java index a20529e616b..d05d7790ba2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectContentTypeMappingDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectContentTypeMappingDialog.java @@ -18,6 +18,9 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; +import org.eclipse.cdt.core.model.LanguageManager; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.internal.ui.preferences.PreferencesMessages; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.content.IContentTypeManager; import org.eclipse.jface.dialogs.IDialogConstants; @@ -32,11 +35,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; -import org.eclipse.cdt.core.model.LanguageManager; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; - -import org.eclipse.cdt.internal.ui.preferences.PreferencesMessages; - public class ProjectContentTypeMappingDialog extends ContentTypeMappingDialog { private Combo fConfiguration; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingPropertyPage.java index 55620483d22..7e77928980b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingPropertyPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingPropertyPage.java @@ -16,6 +16,17 @@ package org.eclipse.cdt.internal.ui.language; import java.util.Map; import java.util.Set; +import org.eclipse.cdt.core.language.ProjectLanguageConfiguration; +import org.eclipse.cdt.core.language.WorkspaceLanguageConfiguration; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.ILanguageMappingChangeEvent; +import org.eclipse.cdt.core.model.ILanguageMappingChangeListener; +import org.eclipse.cdt.core.model.LanguageManager; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.internal.ui.preferences.PreferencesMessages; +import org.eclipse.cdt.internal.ui.util.Messages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.content.IContentType; @@ -31,19 +42,6 @@ import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.MessageBox; import org.eclipse.ui.dialogs.PropertyPage; -import org.eclipse.cdt.core.language.ProjectLanguageConfiguration; -import org.eclipse.cdt.core.language.WorkspaceLanguageConfiguration; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.ILanguageMappingChangeEvent; -import org.eclipse.cdt.core.model.ILanguageMappingChangeListener; -import org.eclipse.cdt.core.model.LanguageManager; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.preferences.PreferencesMessages; -import org.eclipse.cdt.internal.ui.util.Messages; - public class ProjectLanguageMappingPropertyPage extends PropertyPage { private ProjectLanguageMappingWidget fMappingWidget; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingWidget.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingWidget.java index 8e09c0869ce..8805c3f63fb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingWidget.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingWidget.java @@ -17,10 +17,16 @@ import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.TreeMap; -import java.util.Map.Entry; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.LanguageManager; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.internal.ui.preferences.PreferencesMessages; +import org.eclipse.cdt.internal.ui.util.Messages; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.content.IContentTypeManager; @@ -40,14 +46,6 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.LanguageManager; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; - -import org.eclipse.cdt.internal.ui.preferences.PreferencesMessages; -import org.eclipse.cdt.internal.ui.util.Messages; - public class ProjectLanguageMappingWidget extends LanguageMappingWidget { static final String CONTENT_TYPE_KEY_DELIMITER = "::"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceContentTypeMappingDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceContentTypeMappingDialog.java index 02c35aaea60..c4ebcd42ccb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceContentTypeMappingDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceContentTypeMappingDialog.java @@ -16,6 +16,8 @@ package org.eclipse.cdt.internal.ui.language; import java.util.Collections; import java.util.Set; +import org.eclipse.cdt.core.model.LanguageManager; +import org.eclipse.cdt.internal.ui.preferences.PreferencesMessages; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.content.IContentTypeManager; import org.eclipse.jface.dialogs.IDialogConstants; @@ -30,10 +32,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; -import org.eclipse.cdt.core.model.LanguageManager; - -import org.eclipse.cdt.internal.ui.preferences.PreferencesMessages; - public class WorkspaceContentTypeMappingDialog extends ContentTypeMappingDialog { private Set<String> fFilteredContentTypes; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingPreferencePage.java index 353d0667cb3..9ef62e06ca4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingPreferencePage.java @@ -16,6 +16,16 @@ package org.eclipse.cdt.internal.ui.language; import java.util.Map; import java.util.Set; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.CCorePreferenceConstants; +import org.eclipse.cdt.core.language.WorkspaceLanguageConfiguration; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.LanguageManager; +import org.eclipse.cdt.internal.core.language.LanguageMappingStore; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.preferences.PreferencesMessages; +import org.eclipse.cdt.internal.ui.util.Messages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.content.IContentType; import org.eclipse.core.runtime.preferences.IEclipsePreferences; @@ -29,19 +39,6 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.CCorePreferenceConstants; -import org.eclipse.cdt.core.language.WorkspaceLanguageConfiguration; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.LanguageManager; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.core.language.LanguageMappingStore; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.preferences.PreferencesMessages; -import org.eclipse.cdt.internal.ui.util.Messages; - public class WorkspaceLanguageMappingPreferencePage extends PreferencePage implements IWorkbenchPreferencePage { WorkspaceLanguageConfiguration fMappings; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingWidget.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingWidget.java index dfaf20eaae8..a46dc2accbc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingWidget.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingWidget.java @@ -17,10 +17,13 @@ import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.TreeMap; -import java.util.Map.Entry; +import org.eclipse.cdt.core.model.LanguageManager; +import org.eclipse.cdt.internal.ui.preferences.PreferencesMessages; +import org.eclipse.cdt.internal.ui.util.Messages; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.content.IContentTypeManager; import org.eclipse.jface.layout.TableColumnLayout; @@ -39,11 +42,6 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; -import org.eclipse.cdt.core.model.LanguageManager; - -import org.eclipse.cdt.internal.ui.preferences.PreferencesMessages; -import org.eclipse.cdt.internal.ui.util.Messages; - public class WorkspaceLanguageMappingWidget extends LanguageMappingWidget { private Map<String, String> fContentTypeMappings; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingEntryDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingEntryDialog.java index 2680df4bc3f..def666b2e5f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingEntryDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingEntryDialog.java @@ -14,6 +14,15 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.language.settings.providers; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; +import org.eclipse.cdt.core.settings.model.ICSettingEntry; +import org.eclipse.cdt.core.settings.model.util.CDataUtil; +import org.eclipse.cdt.internal.ui.ImageCombo; +import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.newui.AbstractCPropertyTab; +import org.eclipse.cdt.ui.newui.AbstractPropertyDialog; import org.eclipse.core.resources.IProject; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.swt.SWT; @@ -32,17 +41,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; -import org.eclipse.cdt.core.settings.model.ICSettingEntry; -import org.eclipse.cdt.core.settings.model.util.CDataUtil; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.newui.AbstractCPropertyTab; -import org.eclipse.cdt.ui.newui.AbstractPropertyDialog; - -import org.eclipse.cdt.internal.ui.ImageCombo; -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * @noextend This class is not intended to be subclassed by clients. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsEntriesTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsEntriesTab.java index b30cd8c8e3e..c6d6a1cd8b0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsEntriesTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsEntriesTab.java @@ -24,6 +24,25 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; +import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsBroadcastingProvider; +import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsEditableProvider; +import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvider; +import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvidersKeeper; +import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsBaseProvider; +import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager; +import org.eclipse.cdt.core.language.settings.providers.ScannerDiscoveryLegacySupport; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.LanguageManager; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; +import org.eclipse.cdt.core.settings.model.ICResourceDescription; +import org.eclipse.cdt.core.settings.model.ICSettingEntry; +import org.eclipse.cdt.core.settings.model.util.CDataUtil; +import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.cdt.internal.ui.newui.StatusMessageLine; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.newui.AbstractCPropertyTab; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -52,27 +71,6 @@ import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeColumn; import org.eclipse.swt.widgets.TreeItem; -import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsBroadcastingProvider; -import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsEditableProvider; -import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvider; -import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvidersKeeper; -import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsBaseProvider; -import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager; -import org.eclipse.cdt.core.language.settings.providers.ScannerDiscoveryLegacySupport; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.LanguageManager; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; -import org.eclipse.cdt.core.settings.model.ICResourceDescription; -import org.eclipse.cdt.core.settings.model.ICSettingEntry; -import org.eclipse.cdt.core.settings.model.util.CDataUtil; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.newui.AbstractCPropertyTab; - -import org.eclipse.cdt.internal.ui.newui.Messages; -import org.eclipse.cdt.internal.ui.newui.StatusMessageLine; - /** * This tab presents language settings entries categorized by language * settings providers. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsImages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsImages.java index 4ebad2c04c1..f58699bde4f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsImages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsImages.java @@ -13,26 +13,24 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.language.settings.providers; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.viewers.IDecoration; -import org.eclipse.swt.graphics.Image; - import org.eclipse.cdt.core.settings.model.ACPathEntry; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; import org.eclipse.cdt.core.settings.model.ICSettingEntry; import org.eclipse.cdt.core.settings.model.util.CDataUtil; +import org.eclipse.cdt.internal.ui.newui.Messages; import org.eclipse.cdt.ui.CDTSharedImages; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.utils.UNCPathConverter; import org.eclipse.cdt.utils.cdtvariables.CdtVariableResolver; - -import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.viewers.IDecoration; +import org.eclipse.swt.graphics.Image; /** * Helper class to provide unified images for {@link ICLanguageSettingEntry}. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderAssociationManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderAssociationManager.java index 65cd580fc59..6e54203427b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderAssociationManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderAssociationManager.java @@ -21,17 +21,16 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvider; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.dialogs.ICOptionPage; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; -import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvider; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.dialogs.ICOptionPage; - /** * This class manages extensions of extension point org.eclipse.cdt.core.LanguageSettingsProvider * which defines appearance and behavior of UI controls for Language Settings Providers. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java index 3d3911760a0..7e3bfb174fc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java @@ -22,6 +22,22 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsEditableProvider; +import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvider; +import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvidersKeeper; +import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager; +import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsSerializableProvider; +import org.eclipse.cdt.core.language.settings.providers.ScannerDiscoveryLegacySupport; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICResourceDescription; +import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.cdt.internal.ui.newui.StatusMessageLine; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.dialogs.ICOptionPage; +import org.eclipse.cdt.ui.language.settings.providers.AbstractLanguageSettingProviderOptionPage; +import org.eclipse.cdt.ui.newui.AbstractCPropertyTab; +import org.eclipse.cdt.utils.ui.controls.TabFolderLayout; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -49,24 +65,6 @@ import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Table; import org.eclipse.ui.dialogs.PreferencesUtil; -import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsEditableProvider; -import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvider; -import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvidersKeeper; -import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager; -import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsSerializableProvider; -import org.eclipse.cdt.core.language.settings.providers.ScannerDiscoveryLegacySupport; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICResourceDescription; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.dialogs.ICOptionPage; -import org.eclipse.cdt.ui.language.settings.providers.AbstractLanguageSettingProviderOptionPage; -import org.eclipse.cdt.ui.newui.AbstractCPropertyTab; -import org.eclipse.cdt.utils.ui.controls.TabFolderLayout; - -import org.eclipse.cdt.internal.ui.newui.Messages; -import org.eclipse.cdt.internal.ui.newui.StatusMessageLine; - /** * This tab presents language settings entries categorized by language * settings providers. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProvidersLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProvidersLabelProvider.java index a28113a5581..c62962a40b9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProvidersLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProvidersLabelProvider.java @@ -15,17 +15,15 @@ package org.eclipse.cdt.internal.ui.language.settings.providers; import java.net.URL; +import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvider; +import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager; +import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.cdt.ui.CDTSharedImages; import org.eclipse.jface.viewers.IDecoration; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.graphics.Image; -import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvider; -import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager; -import org.eclipse.cdt.ui.CDTSharedImages; - -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * Label provider for language settings providers. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProvidersPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProvidersPage.java index baa56976d7f..57f8062f898 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProvidersPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProvidersPage.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.language.settings.providers; -import org.eclipse.core.resources.IProject; - import org.eclipse.cdt.core.language.settings.providers.ScannerDiscoveryLegacySupport; import org.eclipse.cdt.ui.newui.AbstractPage; import org.eclipse.cdt.ui.newui.ICPropertyTab; +import org.eclipse.core.resources.IProject; /** * Property page for language settings providers tabs. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/AbstractCNavigatorActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/AbstractCNavigatorActionGroup.java index 35ca10559c4..d05843657fe 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/AbstractCNavigatorActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/AbstractCNavigatorActionGroup.java @@ -17,11 +17,11 @@ package org.eclipse.cdt.internal.ui.navigator; import java.net.URL; import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.core.runtime.Assert; import org.eclipse.ui.IActionBars; import org.eclipse.ui.IViewPart; import org.eclipse.ui.actions.ActionGroup; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorBuildActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorBuildActionGroup.java index e3ff84f8d5d..c2b5e19af88 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorBuildActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorBuildActionGroup.java @@ -16,6 +16,8 @@ package org.eclipse.cdt.internal.ui.navigator; import java.util.Iterator; +import org.eclipse.cdt.internal.ui.cview.BuildGroup; +import org.eclipse.cdt.internal.ui.cview.CViewMessages; import org.eclipse.core.resources.ICommand; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -34,9 +36,6 @@ import org.eclipse.ui.actions.BuildAction; import org.eclipse.ui.ide.IDEActionFactory; import org.eclipse.ui.navigator.ICommonMenuConstants; -import org.eclipse.cdt.internal.ui.cview.BuildGroup; -import org.eclipse.cdt.internal.ui.cview.CViewMessages; - /** * Common Navigator compatible clone of {@link org.eclipse.cdt.internal.ui.cview.BuildGroup}. * <p> diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorContentProvider.java index abb7c15a7d0..44718c42cdd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorContentProvider.java @@ -19,6 +19,18 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.CCorePreferenceConstants; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICModel; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.IParent; +import org.eclipse.cdt.internal.core.model.CModel; +import org.eclipse.cdt.internal.core.model.CModelManager; +import org.eclipse.cdt.internal.ui.cview.CViewContentProvider; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; @@ -40,21 +52,6 @@ import org.eclipse.ui.navigator.IPipelinedTreeContentProvider; import org.eclipse.ui.navigator.PipelinedShapeModification; import org.eclipse.ui.navigator.PipelinedViewerUpdate; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.CCorePreferenceConstants; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICModel; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.IParent; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; - -import org.eclipse.cdt.internal.core.model.CModel; -import org.eclipse.cdt.internal.core.model.CModelManager; - -import org.eclipse.cdt.internal.ui.cview.CViewContentProvider; - /** * A content provider populating a Common Navigator view with CDT model content. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDragAdapterAssistant.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDragAdapterAssistant.java index e2b84cfaa07..bed23aaff9e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDragAdapterAssistant.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDragAdapterAssistant.java @@ -17,6 +17,9 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ISourceReference; +import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.core.runtime.IPath; import org.eclipse.jface.util.LocalSelectionTransfer; import org.eclipse.jface.viewers.IStructuredSelection; @@ -25,10 +28,6 @@ import org.eclipse.swt.dnd.FileTransfer; import org.eclipse.swt.dnd.Transfer; import org.eclipse.ui.navigator.CommonDragAdapterAssistant; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ISourceReference; -import org.eclipse.cdt.core.model.ITranslationUnit; - /** * A Common Navigator drag assistant supporting <code>LocalSelectionTransfer</code> of * <code>ICElement</code>s being also <code>ISourceReference</code>s and diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDropAdapterAssistant.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDropAdapterAssistant.java index 179ee7c4018..0e1af1c23e0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDropAdapterAssistant.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDropAdapterAssistant.java @@ -19,6 +19,15 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICContainer; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ISourceReference; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.cview.CViewMessages; +import org.eclipse.cdt.internal.ui.util.ExceptionHandler; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -48,17 +57,6 @@ import org.eclipse.ui.navigator.CommonDropAdapter; import org.eclipse.ui.navigator.CommonDropAdapterAssistant; import org.eclipse.ui.part.ResourceTransfer; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICContainer; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ISourceReference; -import org.eclipse.cdt.core.model.ITranslationUnit; - -import org.eclipse.cdt.internal.ui.cview.CViewMessages; -import org.eclipse.cdt.internal.ui.util.ExceptionHandler; - /** * A Common Navigator drop adapter assistant handling dropping of <code>ICElement</code>s. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorEditActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorEditActionGroup.java index 5b81d2844ba..0f6fb41b6bb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorEditActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorEditActionGroup.java @@ -14,6 +14,8 @@ package org.eclipse.cdt.internal.ui.navigator; +import org.eclipse.cdt.internal.ui.cview.CopyAction; +import org.eclipse.cdt.internal.ui.cview.PasteAction; import org.eclipse.core.resources.IResource; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.viewers.IStructuredSelection; @@ -31,9 +33,6 @@ import org.eclipse.ui.actions.TextActionHandler; import org.eclipse.ui.ide.ResourceSelectionUtil; import org.eclipse.ui.navigator.ICommonMenuConstants; -import org.eclipse.cdt.internal.ui.cview.CopyAction; -import org.eclipse.cdt.internal.ui.cview.PasteAction; - /** * Provides clipboard actions. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorEditActionProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorEditActionProvider.java index a12c7ef5c6b..0df689f2de7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorEditActionProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorEditActionProvider.java @@ -14,6 +14,8 @@ package org.eclipse.cdt.internal.ui.navigator; +import org.eclipse.cdt.internal.ui.actions.SelectionConverter; +import org.eclipse.cdt.ui.actions.GenerateActionGroup; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.viewers.ISelection; import org.eclipse.ui.IActionBars; @@ -23,10 +25,6 @@ import org.eclipse.ui.navigator.CommonActionProvider; import org.eclipse.ui.navigator.ICommonActionExtensionSite; import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite; -import org.eclipse.cdt.ui.actions.GenerateActionGroup; - -import org.eclipse.cdt.internal.ui.actions.SelectionConverter; - /** * Common Navigator action provider for clipboard actions. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorLabelProvider.java index 32984bcd056..34f85dbeb5b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorLabelProvider.java @@ -13,23 +13,21 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.navigator; -import org.eclipse.core.resources.IResource; -import org.eclipse.ui.IMemento; -import org.eclipse.ui.model.IWorkbenchAdapter; -import org.eclipse.ui.navigator.ICommonContentExtensionSite; -import org.eclipse.ui.navigator.ICommonLabelProvider; - import org.eclipse.cdt.core.model.IArchiveContainer; import org.eclipse.cdt.core.model.IBinary; import org.eclipse.cdt.core.model.IBinaryContainer; import org.eclipse.cdt.core.model.IBinaryModule; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; - import org.eclipse.cdt.internal.ui.cview.CViewLabelProvider; import org.eclipse.cdt.internal.ui.cview.CViewMessages; import org.eclipse.cdt.internal.ui.viewsupport.AppearanceAwareLabelProvider; import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; +import org.eclipse.core.resources.IResource; +import org.eclipse.ui.IMemento; +import org.eclipse.ui.model.IWorkbenchAdapter; +import org.eclipse.ui.navigator.ICommonContentExtensionSite; +import org.eclipse.ui.navigator.ICommonLabelProvider; /** * A label provider suitable for the Common Navigator providing also diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorLinkHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorLinkHelper.java index b450f9639a0..05ea77eac76 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorLinkHelper.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorLinkHelper.java @@ -13,6 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.navigator; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.IWorkingCopyManager; import org.eclipse.core.resources.IFile; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; @@ -22,15 +29,6 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.ide.ResourceUtil; import org.eclipse.ui.navigator.ILinkHelper; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.IWorkingCopyManager; - -import org.eclipse.cdt.internal.ui.util.EditorUtility; - /** * Provide support for linking view selection with active editor. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenEditorActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenEditorActionGroup.java index cf41d129b4a..1c0101e30be 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenEditorActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenEditorActionGroup.java @@ -15,6 +15,9 @@ package org.eclipse.cdt.internal.ui.navigator; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.internal.ui.actions.SelectionConverter; +import org.eclipse.cdt.internal.ui.cview.CViewMessages; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -29,11 +32,6 @@ import org.eclipse.ui.actions.OpenInNewWindowAction; import org.eclipse.ui.actions.OpenWithMenu; import org.eclipse.ui.navigator.ICommonMenuConstants; -import org.eclipse.cdt.core.model.ICElement; - -import org.eclipse.cdt.internal.ui.actions.SelectionConverter; -import org.eclipse.cdt.internal.ui.cview.CViewMessages; - /** * This is basically a clone of {@link org.eclipse.cdt.internal.ui.cview.OpenFileGroup}, * but without explicit dependency on CView. This opens it up for use in the diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenViewActionProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenViewActionProvider.java index e0c8a578b3c..808673f025a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenViewActionProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenViewActionProvider.java @@ -14,6 +14,7 @@ package org.eclipse.cdt.internal.ui.navigator; +import org.eclipse.cdt.ui.actions.OpenViewActionGroup; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.viewers.ISelection; import org.eclipse.ui.IActionBars; @@ -23,8 +24,6 @@ import org.eclipse.ui.navigator.CommonActionProvider; import org.eclipse.ui.navigator.ICommonActionExtensionSite; import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite; -import org.eclipse.cdt.ui.actions.OpenViewActionGroup; - public class CNavigatorOpenViewActionProvider extends CommonActionProvider { private OpenViewActionGroup fOpenViewActionGroup; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorProblemsLabelDecorator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorProblemsLabelDecorator.java index a8b06b63d4f..85eb461baad 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorProblemsLabelDecorator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorProblemsLabelDecorator.java @@ -14,9 +14,8 @@ package org.eclipse.cdt.internal.ui.navigator; -import org.eclipse.core.resources.IResource; - import org.eclipse.cdt.internal.ui.viewsupport.ProblemsLabelDecorator; +import org.eclipse.core.resources.IResource; /** * A {@link ProblemsLabelDecorator} optimized for use with the Common Navigator. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorRefactorActionProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorRefactorActionProvider.java index 3b95184d7e9..a0ecd9c2f44 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorRefactorActionProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorRefactorActionProvider.java @@ -14,6 +14,8 @@ package org.eclipse.cdt.internal.ui.navigator; +import org.eclipse.cdt.internal.ui.actions.SelectionConverter; +import org.eclipse.cdt.ui.refactoring.actions.CRefactoringActionGroup; import org.eclipse.core.commands.operations.IUndoContext; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.jface.action.IMenuManager; @@ -27,10 +29,6 @@ import org.eclipse.ui.navigator.ICommonActionExtensionSite; import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite; import org.eclipse.ui.operations.UndoRedoActionGroup; -import org.eclipse.cdt.ui.refactoring.actions.CRefactoringActionGroup; - -import org.eclipse.cdt.internal.ui.actions.SelectionConverter; - /** * A clone of org.eclipse.ui.internal.navigator.resources.actions.RefactorActionProvider. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorRenameResourceAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorRenameResourceAction.java index eff2fc27d3d..09456c29938 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorRenameResourceAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorRenameResourceAction.java @@ -15,6 +15,9 @@ package org.eclipse.cdt.internal.ui.navigator; import java.util.List; +import org.eclipse.cdt.core.CCProjectNature; +import org.eclipse.cdt.core.CProjectNature; +import org.eclipse.cdt.internal.ui.refactoring.rename.CRefactory; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; @@ -22,11 +25,6 @@ import org.eclipse.jface.window.IShellProvider; import org.eclipse.swt.widgets.Tree; import org.eclipse.ui.actions.RenameResourceAction; -import org.eclipse.cdt.core.CCProjectNature; -import org.eclipse.cdt.core.CProjectNature; - -import org.eclipse.cdt.internal.ui.refactoring.rename.CRefactory; - public class CNavigatorRenameResourceAction extends RenameResourceAction { private IShellProvider shell; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/OpenCElementAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/OpenCElementAction.java index 7c8a9a0d7df..81d5e41f809 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/OpenCElementAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/OpenCElementAction.java @@ -18,7 +18,6 @@ import org.eclipse.cdt.core.model.IBinary; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ISourceReference; import org.eclipse.cdt.core.model.ITranslationUnit; - import org.eclipse.cdt.internal.ui.util.EditorUtility; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.CoreException; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlock.java index d456cf8e6d0..c38c278c6e6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlock.java @@ -22,6 +22,8 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.layout.PixelConverter; @@ -46,9 +48,6 @@ import org.eclipse.ui.forms.events.ExpansionAdapter; import org.eclipse.ui.forms.events.ExpansionEvent; import org.eclipse.ui.forms.widgets.ExpandableComposite; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; - /** * Abstract implementation of a generic {@link IPreferenceConfigurationBlock}. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlockPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlockPreferencePage.java index d4404d4da2d..5a85036b5d2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlockPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlockPreferencePage.java @@ -15,12 +15,10 @@ package org.eclipse.cdt.internal.ui.preferences; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; - import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.preference.PreferencePage; - +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.PlatformUI; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractMixedPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractMixedPreferencePage.java index 7c7e66b1f84..909c4a555ea 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractMixedPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractMixedPreferencePage.java @@ -18,13 +18,13 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; -import org.eclipse.cdt.ui.CUIPlugin; /** * A preference that on preference from the UI plugin, as well the CDT core. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractPreferencePage.java index 1b08791b24a..c84112f8154 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractPreferencePage.java @@ -24,6 +24,9 @@ import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; +import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.layout.PixelConverter; import org.eclipse.jface.preference.ColorSelector; @@ -49,11 +52,6 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; -import org.eclipse.cdt.ui.PreferenceConstants; - -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; - /** * AbstractPreferencePage */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AppearancePreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AppearancePreferencePage.java index b5bf0807334..23a90c5f6bf 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AppearancePreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AppearancePreferencePage.java @@ -14,6 +14,17 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.CCorePreferenceConstants; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.Separator; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.preferences.DefaultScope; import org.eclipse.core.runtime.preferences.IEclipsePreferences; @@ -33,19 +44,6 @@ import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.PlatformUI; import org.osgi.service.prefs.BackingStoreException; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.CCorePreferenceConstants; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.Separator; - public class AppearancePreferencePage extends PreferencePage implements IWorkbenchPreferencePage { private SelectionButtonDialogField fShowTUChildren; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildConsolePreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildConsolePreferencePage.java index 22ecffafcc3..6bafb40db9a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildConsolePreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildConsolePreferencePage.java @@ -14,6 +14,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.preference.BooleanFieldEditor; import org.eclipse.jface.preference.ColorFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; @@ -30,13 +32,6 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.core.pdom.WritablePDOM; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.refactoring.gettersandsetters.GenerateGettersAndSettersWizard; - public class BuildConsolePreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { private static final String PREF_CLEAR_CONSOLE = "clearConsole"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildLogPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildLogPreferencePage.java index 3ee41c0645c..23f4d10e0aa 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildLogPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildLogPreferencePage.java @@ -13,6 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; +import org.eclipse.cdt.internal.ui.buildconsole.BuildConsoleManager; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.dialogs.ICOptionContainer; +import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IPath; @@ -35,12 +39,6 @@ import org.eclipse.ui.dialogs.PropertyPage; import org.osgi.service.prefs.BackingStoreException; import org.osgi.service.prefs.Preferences; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.dialogs.ICOptionContainer; -import org.eclipse.cdt.utils.ui.controls.ControlFactory; - -import org.eclipse.cdt.internal.ui.buildconsole.BuildConsoleManager; - /** * Preference page defining build log properties. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringConfigurationBlock.java index e336d167057..6986ce85fe6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringConfigurationBlock.java @@ -21,6 +21,18 @@ import java.io.InputStreamReader; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.core.CCorePreferenceConstants; +import org.eclipse.cdt.internal.ui.editor.CSourceViewer; +import org.eclipse.cdt.internal.ui.editor.SemanticHighlighting; +import org.eclipse.cdt.internal.ui.editor.SemanticHighlightingManager; +import org.eclipse.cdt.internal.ui.editor.SemanticHighlightingWithOwnPreference; +import org.eclipse.cdt.internal.ui.editor.SemanticHighlightings; +import org.eclipse.cdt.internal.ui.text.SimpleCSourceViewerConfiguration; +import org.eclipse.cdt.internal.ui.text.util.CColorManager; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.ICPartitions; +import org.eclipse.cdt.ui.text.IColorManager; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.layout.PixelConverter; import org.eclipse.jface.preference.ColorSelector; @@ -66,20 +78,6 @@ import org.eclipse.ui.texteditor.ChainedPreferenceStore; import com.ibm.icu.text.Collator; -import org.eclipse.cdt.core.CCorePreferenceConstants; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.ICPartitions; -import org.eclipse.cdt.ui.text.IColorManager; - -import org.eclipse.cdt.internal.ui.editor.CSourceViewer; -import org.eclipse.cdt.internal.ui.editor.SemanticHighlighting; -import org.eclipse.cdt.internal.ui.editor.SemanticHighlightingManager; -import org.eclipse.cdt.internal.ui.editor.SemanticHighlightingWithOwnPreference; -import org.eclipse.cdt.internal.ui.editor.SemanticHighlightings; -import org.eclipse.cdt.internal.ui.text.SimpleCSourceViewerConfiguration; -import org.eclipse.cdt.internal.ui.text.util.CColorManager; - /** * Configures C/C++ Editor code coloring preferences. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringPreferencePage.java index a8eda814ca4..6804b2113ff 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringPreferencePage.java @@ -14,13 +14,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; - /** * Code coloring preference page. * <p> diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverConfigurationBlock.java index 7563add6a90..a56853ecadf 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverConfigurationBlock.java @@ -21,6 +21,14 @@ import java.util.Iterator; import java.util.Map; import java.util.StringTokenizer; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; +import org.eclipse.cdt.internal.ui.preferences.OverlayPreferenceStore.OverlayKey; +import org.eclipse.cdt.internal.ui.text.c.hover.CEditorTextHoverDescriptor; +import org.eclipse.cdt.internal.ui.util.SWTUtil; +import org.eclipse.cdt.internal.ui.util.TableLayoutComposite; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.action.Action; @@ -58,16 +66,6 @@ import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; - -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; -import org.eclipse.cdt.internal.ui.preferences.OverlayPreferenceStore.OverlayKey; -import org.eclipse.cdt.internal.ui.text.c.hover.CEditorTextHoverDescriptor; -import org.eclipse.cdt.internal.ui.util.SWTUtil; -import org.eclipse.cdt.internal.ui.util.TableLayoutComposite; - /** * Configures C/C++ Editor hover preferences. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverPreferencePage.java index 392c21e08cb..ae541bd086e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverPreferencePage.java @@ -14,13 +14,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; - /** * The page for setting the editor hover options. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java index ff7405296e6..fc10db591ef 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java @@ -24,6 +24,16 @@ import static org.eclipse.cdt.ui.PreferenceConstants.FORMATTING_SCOPE_STATEMENT; import java.util.ArrayList; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.preferences.OverlayPreferenceStore.OverlayKey; +import org.eclipse.cdt.internal.ui.text.c.hover.SourceViewerInformationControl; +import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference; +import org.eclipse.cdt.internal.ui.text.doctools.DocCommentOwnerManager; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.dialogs.DocCommentOwnerComposite; +import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; +import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.preference.ColorSelector; @@ -50,18 +60,6 @@ import org.eclipse.ui.dialogs.PreferencesUtil; import org.osgi.framework.Bundle; import org.osgi.framework.Version; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.dialogs.DocCommentOwnerComposite; -import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; -import org.eclipse.cdt.utils.ui.controls.ControlFactory; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.preferences.OverlayPreferenceStore.OverlayKey; -import org.eclipse.cdt.internal.ui.text.c.hover.SourceViewerInformationControl; -import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference; -import org.eclipse.cdt.internal.ui.text.doctools.DocCommentOwnerManager; - /** * The preference page for setting the editor options. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypeDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypeDialog.java index 3b550013c70..153b09c2078 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypeDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypeDialog.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.internal.ui.preferences; import java.util.ArrayList; +import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.content.IContentType; import org.eclipse.core.runtime.content.IContentTypeManager; @@ -33,8 +34,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.core.model.CoreModel; - public class CFileTypeDialog extends Dialog { public CFileTypeDialog(Shell parentShell) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferenceBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferenceBlock.java index 5c1bc35ad28..3e4ce9d14f9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferenceBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferenceBlock.java @@ -18,6 +18,9 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.internal.ui.util.Messages; +import org.eclipse.cdt.internal.ui.util.SWTUtil; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ProjectScope; import org.eclipse.core.runtime.CoreException; @@ -51,11 +54,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.cdt.core.model.CoreModel; - -import org.eclipse.cdt.internal.ui.util.Messages; -import org.eclipse.cdt.internal.ui.util.SWTUtil; - /* * Preference block that encapsulates the controls used * for displaying/editing CDT file type associations diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java index 6e666f31d84..d17771c47b7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java @@ -16,6 +16,10 @@ package org.eclipse.cdt.internal.ui.preferences; import java.util.ArrayList; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.internal.core.model.CModelManager; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ProjectScope; import org.eclipse.core.runtime.CoreException; @@ -23,8 +27,8 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.content.IContentType; import org.eclipse.core.runtime.content.IContentTypeManager; -import org.eclipse.core.runtime.content.IContentTypeSettings; import org.eclipse.core.runtime.content.IContentTypeManager.ContentTypeChangeEvent; +import org.eclipse.core.runtime.content.IContentTypeSettings; import org.eclipse.core.runtime.preferences.IScopeContext; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; @@ -37,13 +41,6 @@ import org.eclipse.swt.widgets.Listener; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.PropertyPage; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.model.CoreModel; - -import org.eclipse.cdt.internal.core.model.CModelManager; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; - /* * The preference page used for displaying/editing CDT file * type associations for a project diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CPluginPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CPluginPreferencePage.java index 3ac5144a838..d9202bb33c9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CPluginPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CPluginPreferencePage.java @@ -19,6 +19,12 @@ package org.eclipse.cdt.internal.ui.preferences; import java.util.ArrayList; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.dialogs.OptionalMessageDialog; +import org.eclipse.cdt.internal.ui.util.SWTUtil; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.layout.PixelConverter; @@ -40,14 +46,6 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.dialogs.OptionalMessageDialog; -import org.eclipse.cdt.internal.ui.util.SWTUtil; - /** * The page for general C/C++ preferences. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CSourcePreviewerUpdater.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CSourcePreviewerUpdater.java index c91454a33ff..c29a0390006 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CSourcePreviewerUpdater.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CSourcePreviewerUpdater.java @@ -14,6 +14,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.CSourceViewerConfiguration; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.resource.JFaceResources; @@ -24,9 +26,6 @@ import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.graphics.Font; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.CSourceViewerConfiguration; - public class CSourcePreviewerUpdater { /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CTemplatePreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CTemplatePreferencePage.java index 8196d123ec1..7788b63ba9f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CTemplatePreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CTemplatePreferencePage.java @@ -14,6 +14,13 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.editor.CSourceViewer; +import org.eclipse.cdt.internal.ui.text.CTextTools; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.CSourceViewerConfiguration; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.text.Document; @@ -36,15 +43,6 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.texteditor.templates.TemplatePreferencePage; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.CSourceViewerConfiguration; -import org.eclipse.cdt.ui.text.ICPartitions; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.editor.CSourceViewer; -import org.eclipse.cdt.internal.ui.text.CTextTools; - /** * Template preference page for C/C++ editor templates. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java index 276c3a2116b..21596d0ae17 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java @@ -22,6 +22,14 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.text.contentassist.CompletionProposalCategory; +import org.eclipse.cdt.internal.ui.text.contentassist.CompletionProposalComputerRegistry; +import org.eclipse.cdt.internal.ui.util.Messages; +import org.eclipse.cdt.internal.ui.util.SWTUtil; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.core.commands.Command; import org.eclipse.core.commands.CommandManager; import org.eclipse.core.commands.IParameter; @@ -66,16 +74,6 @@ import org.eclipse.ui.keys.IBindingService; import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; - -import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.text.contentassist.CompletionProposalCategory; -import org.eclipse.cdt.internal.ui.text.contentassist.CompletionProposalComputerRegistry; -import org.eclipse.cdt.internal.ui.util.Messages; -import org.eclipse.cdt.internal.ui.util.SWTUtil; - /** * * @since 3.2 diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedPreferencePage.java index d265e95fab9..9a63865b31a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedPreferencePage.java @@ -14,16 +14,13 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; import org.eclipse.core.resources.IProject; - import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; - import org.eclipse.ui.PlatformUI; import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; - public final class CodeAssistAdvancedPreferencePage extends PropertyAndPreferencePage { private CodeAssistAdvancedConfigurationBlock fConfigurationBlock; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java index 39b3bf901e8..2bf4dcd9a11 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java @@ -21,6 +21,9 @@ package org.eclipse.cdt.internal.ui.preferences; import java.util.ArrayList; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.preferences.OverlayPreferenceStore.OverlayKey; +import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridLayout; @@ -31,10 +34,6 @@ import org.eclipse.swt.widgets.Group; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.preferences.OverlayPreferenceStore.OverlayKey; -import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference; - /** * Content Assist preference page. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeFormatterPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeFormatterPreferencePage.java index e7b72c23b0b..3bd2ee7768a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeFormatterPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeFormatterPreferencePage.java @@ -15,6 +15,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.preferences.formatter.CodeFormatterConfigurationBlock; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.preference.IPreferencePageContainer; @@ -25,9 +27,6 @@ import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; import org.eclipse.ui.preferences.IWorkingCopyManager; import org.eclipse.ui.preferences.WorkingCopyManager; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.preferences.formatter.CodeFormatterConfigurationBlock; - /* * The page to configure the code formatter options. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeStyleBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeStyleBlock.java index f747c5c6e7d..170351745ab 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeStyleBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeStyleBlock.java @@ -13,6 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.CCorePreferenceConstants; +import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; +import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.core.resources.IProject; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Point; @@ -21,12 +25,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.CCorePreferenceConstants; -import org.eclipse.cdt.ui.PreferenceConstants; - -import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; - /** * Configures elements of C/C++ code style affecting refactoring. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeStylePreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeStylePreferencePage.java index 0480779198a..aa44fd5b2e9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeStylePreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeStylePreferencePage.java @@ -13,11 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; -import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; - -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; /** * The page for setting various code style preferences. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateBlock.java index 83418b54884..892ff6674ab 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateBlock.java @@ -32,6 +32,23 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import org.eclipse.cdt.internal.corext.template.c.CodeTemplateContextType; +import org.eclipse.cdt.internal.corext.template.c.FileTemplateContextType; +import org.eclipse.cdt.internal.corext.util.Messages; +import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; +import org.eclipse.cdt.internal.ui.editor.CSourceViewer; +import org.eclipse.cdt.internal.ui.text.CTextTools; +import org.eclipse.cdt.internal.ui.text.template.TemplateVariableProcessor; +import org.eclipse.cdt.internal.ui.viewsupport.ProjectTemplateStore; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.core.resources.IProject; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.layout.PixelConverter; @@ -61,26 +78,6 @@ import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Label; import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.ICPartitions; - -import org.eclipse.cdt.internal.corext.template.c.CodeTemplateContextType; -import org.eclipse.cdt.internal.corext.template.c.FileTemplateContextType; -import org.eclipse.cdt.internal.corext.util.Messages; - -import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; -import org.eclipse.cdt.internal.ui.editor.CSourceViewer; -import org.eclipse.cdt.internal.ui.text.CTextTools; -import org.eclipse.cdt.internal.ui.text.template.TemplateVariableProcessor; -import org.eclipse.cdt.internal.ui.viewsupport.ProjectTemplateStore; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField; - /** */ public class CodeTemplateBlock extends OptionsConfigurationBlock { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplatePreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplatePreferencePage.java index 3b4b8c75478..1961b8fd888 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplatePreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplatePreferencePage.java @@ -16,6 +16,9 @@ package org.eclipse.cdt.internal.ui.preferences; import java.util.Map; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.text.templates.persistence.TemplatePersistenceData; @@ -24,11 +27,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; - /* * The page to configure the code templates. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateSourceViewerConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateSourceViewerConfiguration.java index dbfd2355ef5..b9b7d428d39 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateSourceViewerConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateSourceViewerConfiguration.java @@ -16,6 +16,14 @@ package org.eclipse.cdt.internal.ui.preferences; import java.util.Iterator; +import org.eclipse.cdt.internal.corext.template.c.CodeTemplateContextType; +import org.eclipse.cdt.internal.ui.text.CWordFinder; +import org.eclipse.cdt.internal.ui.text.SimpleCSourceViewerConfiguration; +import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference; +import org.eclipse.cdt.internal.ui.text.template.TemplateVariableProcessor; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.ICPartitions; +import org.eclipse.cdt.ui.text.IColorManager; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.DefaultInformationControl; @@ -34,17 +42,6 @@ import org.eclipse.jface.text.templates.TemplateVariableResolver; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.ICPartitions; -import org.eclipse.cdt.ui.text.IColorManager; - -import org.eclipse.cdt.internal.corext.template.c.CodeTemplateContextType; - -import org.eclipse.cdt.internal.ui.text.CWordFinder; -import org.eclipse.cdt.internal.ui.text.SimpleCSourceViewerConfiguration; -import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference; -import org.eclipse.cdt.internal.ui.text.template.TemplateVariableProcessor; - public class CodeTemplateSourceViewerConfiguration extends SimpleCSourceViewerConfiguration { private static class TemplateVariableTextHover implements ITextHover { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ConfigurationBlockPropertyAndPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ConfigurationBlockPropertyAndPreferencePage.java index 2182d9aee5f..726ca2b85ad 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ConfigurationBlockPropertyAndPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ConfigurationBlockPropertyAndPreferencePage.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; +import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IStatus; import org.eclipse.swt.widgets.Composite; @@ -20,8 +21,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; -import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; - public abstract class ConfigurationBlockPropertyAndPreferencePage extends PropertyAndPreferencePage { private OptionsConfigurationBlock fConfigurationBlock; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java index 4bae9c40a0e..30abbfc6849 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java @@ -22,6 +22,15 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.IContextMenuConstants; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.editor.CSourceViewer; +import org.eclipse.cdt.internal.ui.text.CTextTools; +import org.eclipse.cdt.internal.ui.text.template.TemplateVariableProcessor; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.core.expressions.Expression; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.GroupMarker; @@ -84,17 +93,6 @@ import org.eclipse.ui.texteditor.ITextEditorActionConstants; import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds; import org.eclipse.ui.texteditor.IUpdate; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.ICPartitions; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.IContextMenuConstants; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.editor.CSourceViewer; -import org.eclipse.cdt.internal.ui.text.CTextTools; -import org.eclipse.cdt.internal.ui.text.template.TemplateVariableProcessor; - /** * Dialog to edit a template. * @since 5.2 diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingConfigurationBlock.java index e451dd85b8d..07ce2a42f6d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingConfigurationBlock.java @@ -17,6 +17,12 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import org.eclipse.cdt.internal.ui.preferences.OverlayPreferenceStore.OverlayKey; +import org.eclipse.cdt.internal.ui.text.folding.CFoldingStructureProviderDescriptor; +import org.eclipse.cdt.internal.ui.text.folding.CFoldingStructureProviderRegistry; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.folding.ICFoldingPreferenceBlock; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; @@ -44,14 +50,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.folding.ICFoldingPreferenceBlock; - -import org.eclipse.cdt.internal.ui.preferences.OverlayPreferenceStore.OverlayKey; -import org.eclipse.cdt.internal.ui.text.folding.CFoldingStructureProviderDescriptor; -import org.eclipse.cdt.internal.ui.text.folding.CFoldingStructureProviderRegistry; - /** * Configures C Editor folding preferences. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingPreferencePage.java index 522bb1ebf0f..c1e71a7eb9a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingPreferencePage.java @@ -14,13 +14,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; - /** * The page for setting the editor folding options. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/GlobalBuildLogPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/GlobalBuildLogPreferencePage.java index 7762708d35f..aa9e52f598b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/GlobalBuildLogPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/GlobalBuildLogPreferencePage.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; +import org.eclipse.cdt.internal.ui.buildconsole.BuildConsoleManager; +import org.eclipse.cdt.internal.ui.buildconsole.GlobalBuildConsoleManager; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.jface.preference.BooleanFieldEditor; @@ -25,9 +27,6 @@ import org.eclipse.swt.widgets.FileDialog; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; -import org.eclipse.cdt.internal.ui.buildconsole.BuildConsoleManager; -import org.eclipse.cdt.internal.ui.buildconsole.GlobalBuildConsoleManager; - /** * Preference page for build logging options, such as whether the * global build console should be logged and, if so, where. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/HeaderSubstitutionBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/HeaderSubstitutionBlock.java index c8902e6af5e..41cec642bf2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/HeaderSubstitutionBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/HeaderSubstitutionBlock.java @@ -15,6 +15,15 @@ package org.eclipse.cdt.internal.ui.preferences; import java.util.List; +import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.refactoring.includes.HeaderSubstitutionMap; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; +import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.layout.PixelConverter; @@ -33,17 +42,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; -import org.eclipse.cdt.ui.PreferenceConstants; - -import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.refactoring.includes.HeaderSubstitutionMap; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; - /** * The preference block for configuring header file substitution rules. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/HeaderSubstitutionEditDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/HeaderSubstitutionEditDialog.java index 2d0d6ae5a77..6070749173d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/HeaderSubstitutionEditDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/HeaderSubstitutionEditDialog.java @@ -13,6 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.dialogs.ResizableStatusDialog; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringDialogField; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.layout.PixelConverter; import org.eclipse.swt.SWT; @@ -23,14 +30,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.dialogs.ResizableStatusDialog; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringDialogField; - public class HeaderSubstitutionEditDialog extends ResizableStatusDialog { private final StringDialogField fSourceField; private final StringDialogField fTargetField; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/HeaderSubstitutionMapEditDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/HeaderSubstitutionMapEditDialog.java index 30307b8b355..7611512731b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/HeaderSubstitutionMapEditDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/HeaderSubstitutionMapEditDialog.java @@ -29,6 +29,20 @@ import java.util.List; import java.util.Map.Entry; import java.util.Set; +import org.eclipse.cdt.internal.corext.codemanipulation.IncludeInfo; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.dialogs.ResizableStatusDialog; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.refactoring.includes.HeaderSubstitutionMap; +import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeMap; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ComboDialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.Separator; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringDialogField; import org.eclipse.core.filesystem.EFS; import org.eclipse.core.filesystem.IFileStore; import org.eclipse.core.runtime.CoreException; @@ -59,22 +73,6 @@ import org.eclipse.ui.XMLMemento; import com.ibm.icu.text.Collator; -import org.eclipse.cdt.internal.corext.codemanipulation.IncludeInfo; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.dialogs.ResizableStatusDialog; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.refactoring.includes.HeaderSubstitutionMap; -import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeMap; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ComboDialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.Separator; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringDialogField; - /** * Dialog for editing a header file substitution map. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/HeaderSubstitutionPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/HeaderSubstitutionPreferencePage.java index c11ea9d1ca0..3d0de3e1a2b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/HeaderSubstitutionPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/HeaderSubstitutionPreferencePage.java @@ -13,11 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; -import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; - -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; /* * The preference page for configuring header file substitution rules. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludeCategoriesBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludeCategoriesBlock.java index efe8fbce532..03a1f839b23 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludeCategoriesBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludeCategoriesBlock.java @@ -18,6 +18,14 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeGroupStyle; +import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeGroupStyle.IncludeKind; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField; import org.eclipse.core.resources.IProject; import org.eclipse.jface.layout.PixelConverter; import org.eclipse.jface.viewers.LabelProvider; @@ -34,15 +42,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; -import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeGroupStyle; -import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeGroupStyle.IncludeKind; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField; - /** * The preference block for configuring styles of different categories of include statements. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludeGroupStyleBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludeGroupStyleBlock.java index e18c82d2da4..241bab819bc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludeGroupStyleBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludeGroupStyleBlock.java @@ -15,6 +15,10 @@ package org.eclipse.cdt.internal.ui.preferences; import java.util.ArrayList; +import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeGroupStyle; +import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.core.resources.IProject; import org.eclipse.jface.layout.PixelConverter; import org.eclipse.jface.resource.JFaceResources; @@ -29,12 +33,6 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Widget; import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; -import org.eclipse.cdt.utils.ui.controls.ControlFactory; - -import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeGroupStyle; - /** * The preference block for configuring styles of different categories of include statements. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludeOrderBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludeOrderBlock.java index 47bf82036f3..64a8b570dcf 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludeOrderBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludeOrderBlock.java @@ -19,6 +19,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeGroupStyle; +import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeGroupStyle.IncludeKind; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; import org.eclipse.core.resources.IProject; import org.eclipse.jface.layout.PixelConverter; import org.eclipse.jface.viewers.ISelection; @@ -32,12 +37,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; -import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeGroupStyle; -import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeGroupStyle.IncludeKind; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; - /** * The preference block for configuring relative order of include statements. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludePragmasBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludePragmasBlock.java index 6770049fc23..abdc8d82c63 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludePragmasBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludePragmasBlock.java @@ -16,6 +16,11 @@ package org.eclipse.cdt.internal.ui.preferences; import java.net.MalformedURLException; import java.net.URL; +import org.eclipse.cdt.core.CCorePreferenceConstants; +import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.jface.layout.PixelConverter; import org.eclipse.swt.SWT; @@ -33,13 +38,6 @@ import org.eclipse.ui.browser.IWebBrowser; import org.eclipse.ui.browser.IWorkbenchBrowserSupport; import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; -import org.eclipse.cdt.core.CCorePreferenceConstants; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; - /** * The preference block for configuring Organize Includes command. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludePragmasPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludePragmasPreferencePage.java index 7139f21b625..8ab75bdab62 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludePragmasPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludePragmasPreferencePage.java @@ -13,11 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; -import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; - -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; /* * The preference page for configuring include-related pragmas. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludeStyleBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludeStyleBlock.java index e9c9bda9b2c..db02beeae87 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludeStyleBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludeStyleBlock.java @@ -19,14 +19,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.eclipse.core.resources.IProject; -import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; - -import org.eclipse.cdt.ui.PreferenceConstants; - import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeGroupStyle; import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeGroupStyle.IncludeKind; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.core.resources.IProject; +import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; /** * The preference block for configuring style of include statements. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludeStylePreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludeStylePreferencePage.java index 5f3f2a3ec94..7dcd3c2be38 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludeStylePreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IncludeStylePreferencePage.java @@ -13,11 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; -import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; - -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; /* * The preference page for configuring styles of include statements. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerPreferencePage.java index c321deba782..d316786d998 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerPreferencePage.java @@ -14,6 +14,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.dialogs.CacheSizeBlock; +import org.eclipse.cdt.ui.dialogs.ICOptionContainer; +import org.eclipse.cdt.ui.dialogs.IndexerBlock; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; @@ -29,13 +34,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.activities.IIdentifier; import org.eclipse.ui.activities.IWorkbenchActivitySupport; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.dialogs.CacheSizeBlock; -import org.eclipse.cdt.ui.dialogs.ICOptionContainer; -import org.eclipse.cdt.ui.dialogs.IndexerBlock; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; - public class IndexerPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, ICOptionContainer { // bug 217860, allow to hide build configuration private static final String SHOW_BUILD_SPECIFIC_CONFIG = "show.build.specific.indexer.config"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerStrategyBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerStrategyBlock.java index 40d492ad011..a076dafdb8f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerStrategyBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerStrategyBlock.java @@ -13,6 +13,14 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager; +import org.eclipse.cdt.core.settings.model.ICProjectDescriptionPreferences; +import org.eclipse.cdt.core.settings.model.ICProjectDescriptionWorkspacePreferences; +import org.eclipse.cdt.internal.core.pdom.indexer.IndexerPreferences; +import org.eclipse.cdt.ui.dialogs.AbstractCOptionPage; +import org.eclipse.cdt.ui.dialogs.ICOptionContainer; +import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; @@ -25,16 +33,6 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager; -import org.eclipse.cdt.core.settings.model.ICProjectDescriptionPreferences; -import org.eclipse.cdt.core.settings.model.ICProjectDescriptionWorkspacePreferences; -import org.eclipse.cdt.ui.dialogs.AbstractCOptionPage; -import org.eclipse.cdt.ui.dialogs.ICOptionContainer; -import org.eclipse.cdt.utils.ui.controls.ControlFactory; - -import org.eclipse.cdt.internal.core.pdom.indexer.IndexerPreferences; - /** * This OptionPage is used in the IndexerPreference page to allow for adjusting * various parsing related caches. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/MarkOccurrencesConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/MarkOccurrencesConfigurationBlock.java index ce6f4a03b42..41b97419cc0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/MarkOccurrencesConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/MarkOccurrencesConfigurationBlock.java @@ -19,6 +19,9 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.preferences.OverlayPreferenceStore.OverlayKey; +import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.layout.PixelConverter; @@ -35,11 +38,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Link; import org.eclipse.ui.dialogs.PreferencesUtil; -import org.eclipse.cdt.ui.PreferenceConstants; - -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.preferences.OverlayPreferenceStore.OverlayKey; - /** * Configures C/C++ Editor mark occurrences preferences. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/MarkOccurrencesPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/MarkOccurrencesPreferencePage.java index fb16e27aedd..21ced09051f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/MarkOccurrencesPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/MarkOccurrencesPreferencePage.java @@ -15,13 +15,11 @@ package org.eclipse.cdt.internal.ui.preferences; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; - /** * The page for setting the editor options. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStyleBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStyleBlock.java index f2939f9e8b0..192b3a83f22 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStyleBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStyleBlock.java @@ -16,6 +16,17 @@ package org.eclipse.cdt.internal.ui.preferences; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.internal.corext.codemanipulation.StubUtility; +import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.util.NameComposer; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.core.resources.IProject; import org.eclipse.jface.layout.PixelConverter; import org.eclipse.jface.viewers.LabelProvider; @@ -34,20 +45,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.utils.ui.controls.ControlFactory; - -import org.eclipse.cdt.internal.corext.codemanipulation.StubUtility; - -import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.util.NameComposer; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField; - /** * The preference block for configuring styles of names. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStylePreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStylePreferencePage.java index eb79d8be30d..182c928a0bc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStylePreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStylePreferencePage.java @@ -13,11 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; -import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; - -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; /* * The preference page for configuring styles of names. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java index fd7bb61ce87..40a1b9220a6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java @@ -22,6 +22,9 @@ import java.util.List; import java.util.Map; import java.util.StringTokenizer; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ProjectScope; import org.eclipse.core.runtime.preferences.DefaultScope; @@ -57,11 +60,6 @@ import org.eclipse.ui.preferences.IWorkingCopyManager; import org.eclipse.ui.preferences.WorkingCopyManager; import org.osgi.service.prefs.BackingStoreException; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; - /** * Abstract options configuration block providing a general implementation for setting up * an options configuration page. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OrganizeIncludesBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OrganizeIncludesBlock.java index f3a50257d1a..4553959bf25 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OrganizeIncludesBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OrganizeIncludesBlock.java @@ -13,6 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; +import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.refactoring.includes.IncludePreferences.UnusedStatementDisposition; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.core.resources.IProject; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridLayout; @@ -20,13 +25,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; -import org.eclipse.cdt.ui.PreferenceConstants; - -import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.refactoring.includes.IncludePreferences.UnusedStatementDisposition; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; - /** * The preference block for configuring Organize Includes command. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OrganizeIncludesPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OrganizeIncludesPreferencePage.java index 7a121254731..9492779e810 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OrganizeIncludesPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OrganizeIncludesPreferencePage.java @@ -13,11 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; -import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; - -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; /* * The preference page for configuring Organize Includes command. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ProjectSelectionDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ProjectSelectionDialog.java index 1d8334b2943..1cbc15fcce8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ProjectSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ProjectSelectionDialog.java @@ -16,6 +16,14 @@ package org.eclipse.cdt.internal.ui.preferences; import java.util.Set; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICModel; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.ui.CElementContentProvider; +import org.eclipse.cdt.ui.CElementLabelProvider; +import org.eclipse.cdt.ui.CElementSorter; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogSettings; @@ -38,16 +46,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.dialogs.SelectionStatusDialog; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICModel; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.CElementContentProvider; -import org.eclipse.cdt.ui.CElementLabelProvider; -import org.eclipse.cdt.ui.CElementSorter; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; - public class ProjectSelectionDialog extends SelectionStatusDialog { // the visual selection widget group private TableViewer fTableViewer; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PropertyAndPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PropertyAndPreferencePage.java index 0b563d30a99..8b0dfe7c68b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PropertyAndPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PropertyAndPreferencePage.java @@ -19,6 +19,16 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IAdaptable; @@ -41,18 +51,6 @@ import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.IWorkbenchPropertyPage; import org.eclipse.ui.dialogs.PreferencesUtil; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICProject; - -import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField; - /** * Base for project property and preference pages */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ProposalFilterPreferencesUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ProposalFilterPreferencesUtil.java index fdf260eadc6..f20b09d3797 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ProposalFilterPreferencesUtil.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ProposalFilterPreferencesUtil.java @@ -15,6 +15,8 @@ package org.eclipse.cdt.internal.ui.preferences; import java.util.ArrayList; +import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IExtensionPoint; @@ -23,10 +25,6 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.swt.widgets.Combo; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference; - /** * A class which encapsulates several utility functions * related to code completion preference settings. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SaveActionsPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SaveActionsPreferencePage.java index 38b23e24c53..fb7a521b658 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SaveActionsPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SaveActionsPreferencePage.java @@ -14,15 +14,18 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; +import static org.eclipse.cdt.ui.PreferenceConstants.ALIGN_ALL_CONST; import static org.eclipse.cdt.ui.PreferenceConstants.ENSURE_NEWLINE_AT_EOF; import static org.eclipse.cdt.ui.PreferenceConstants.FORMAT_SOURCE_CODE; import static org.eclipse.cdt.ui.PreferenceConstants.FORMAT_SOURCE_CODE_LIMIT_TO_EDITED_LINES; import static org.eclipse.cdt.ui.PreferenceConstants.REMOVE_TRAILING_WHITESPACE; import static org.eclipse.cdt.ui.PreferenceConstants.REMOVE_TRAILING_WHITESPACE_LIMIT_TO_EDITED_LINES; -import static org.eclipse.cdt.ui.PreferenceConstants.ALIGN_ALL_CONST; import java.util.ArrayList; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.preferences.OverlayPreferenceStore.OverlayKey; +import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; @@ -30,11 +33,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.utils.ui.controls.ControlFactory; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.preferences.OverlayPreferenceStore.OverlayKey; - /* * The page for configuring actions performed when a C/C++ file is saved. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ScalabilityPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ScalabilityPreferencePage.java index 9611fb89e06..be3a1a33e4b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ScalabilityPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ScalabilityPreferencePage.java @@ -20,6 +20,12 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import org.eclipse.cdt.core.CCorePreferenceConstants; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.Separator; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.preference.FieldEditor; @@ -43,14 +49,6 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.core.CCorePreferenceConstants; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.utils.ui.controls.ControlFactory; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.Separator; - public class ScalabilityPreferencePage extends PreferencePage implements IWorkbenchPreferencePage { // Files with this number of lines will trigger scalability mode diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ScrolledPageContent.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ScrolledPageContent.java index fa78a7d1e05..03ec4618b89 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ScrolledPageContent.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ScrolledPageContent.java @@ -17,7 +17,6 @@ package org.eclipse.cdt.internal.ui.preferences; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; - import org.eclipse.ui.forms.FormColors; import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.SharedScrolledComposite; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SmartTypingConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SmartTypingConfigurationBlock.java index a41c0074549..f6c3514fe1d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SmartTypingConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SmartTypingConfigurationBlock.java @@ -15,6 +15,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; +import org.eclipse.cdt.internal.corext.util.CodeFormatterUtil; +import org.eclipse.cdt.internal.ui.util.Messages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.preference.IPreferenceStore; @@ -33,15 +39,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Link; import org.eclipse.ui.dialogs.PreferencesUtil; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; - -import org.eclipse.cdt.internal.corext.util.CodeFormatterUtil; - -import org.eclipse.cdt.internal.ui.util.Messages; - /** * Configures C Editor typing preferences. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SmartTypingPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SmartTypingPreferencePage.java index 40b3f91bc91..89cfd670eb9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SmartTypingPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SmartTypingPreferencePage.java @@ -14,13 +14,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; - /** * The page for setting the editor options. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SpellingConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SpellingConfigurationBlock.java index c0eae011791..613b5bbad27 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SpellingConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SpellingConfigurationBlock.java @@ -20,6 +20,14 @@ import java.util.List; import java.util.Locale; import java.util.Set; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; +import org.eclipse.cdt.internal.ui.text.spelling.SpellCheckEngine; +import org.eclipse.cdt.internal.ui.util.SWTUtil; +import org.eclipse.cdt.internal.ui.wizards.indexwizards.StringVariableSelectionDialog; +import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; @@ -51,16 +59,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.ide.dialogs.EncodingFieldEditor; import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; -import org.eclipse.cdt.ui.PreferenceConstants; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; -import org.eclipse.cdt.internal.ui.text.spelling.SpellCheckEngine; -import org.eclipse.cdt.internal.ui.util.SWTUtil; -import org.eclipse.cdt.internal.ui.wizards.indexwizards.StringVariableSelectionDialog; - /** * Options configuration block for spell check related settings. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SpellingPreferenceBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SpellingPreferenceBlock.java index f2ebffb38dc..a51f762a379 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SpellingPreferenceBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SpellingPreferenceBlock.java @@ -15,14 +15,13 @@ package org.eclipse.cdt.internal.ui.preferences; +import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; import org.eclipse.core.runtime.IStatus; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.texteditor.spelling.IPreferenceStatusMonitor; import org.eclipse.ui.texteditor.spelling.ISpellingPreferenceBlock; -import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; - /** * Spelling preference block */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TabConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TabConfigurationBlock.java index 6b2e80ae94c..669324b517d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TabConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TabConfigurationBlock.java @@ -15,6 +15,9 @@ package org.eclipse.cdt.internal.ui.preferences; import java.util.ArrayList; +import org.eclipse.cdt.core.parser.util.ArrayUtil; +import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; +import org.eclipse.cdt.utils.ui.controls.TabFolderLayout; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -31,11 +34,6 @@ import org.eclipse.swt.widgets.TabFolder; import org.eclipse.swt.widgets.TabItem; import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; -import org.eclipse.cdt.core.parser.util.ArrayUtil; -import org.eclipse.cdt.utils.ui.controls.TabFolderLayout; - -import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; - /** * The preference block for configuring styles of names. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskConfigurationBlock.java index 6a31c5c9b77..255e3312434 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskConfigurationBlock.java @@ -17,6 +17,15 @@ package org.eclipse.cdt.internal.ui.preferences; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.core.CCorePreferenceConstants; +import org.eclipse.cdt.internal.corext.util.Messages; +import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.layout.PixelConverter; @@ -36,18 +45,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; -import org.eclipse.cdt.core.CCorePreferenceConstants; - -import org.eclipse.cdt.internal.corext.util.Messages; - -import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField; - /** * UI for editing task tags. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskInputDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskInputDialog.java index 1d78611eb13..6b3235b6137 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskInputDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskInputDialog.java @@ -17,16 +17,7 @@ package org.eclipse.cdt.internal.ui.preferences; import java.util.ArrayList; import java.util.List; -import org.eclipse.jface.dialogs.StatusDialog; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.PlatformUI; - import org.eclipse.cdt.core.CCorePreferenceConstants; - import org.eclipse.cdt.internal.ui.ICHelpContextIds; import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; import org.eclipse.cdt.internal.ui.preferences.TodoTaskConfigurationBlock.TodoTask; @@ -35,6 +26,13 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringDialogField; +import org.eclipse.jface.dialogs.StatusDialog; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.PlatformUI; /** * Dialog to enter a new task tag. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskPreferencePage.java index 441128ffa73..b18c88efa82 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskPreferencePage.java @@ -15,19 +15,15 @@ package org.eclipse.cdt.internal.ui.preferences; -import org.eclipse.core.runtime.IAdaptable; - +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; - +import org.eclipse.core.runtime.IAdaptable; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; - import org.eclipse.ui.PlatformUI; import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.ui.CUIPlugin; - /* * The page to configure the task tags */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/WorkInProgressPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/WorkInProgressPreferencePage.java index 149ae06ce0c..3275b97d942 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/WorkInProgressPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/WorkInProgressPreferencePage.java @@ -17,6 +17,7 @@ package org.eclipse.cdt.internal.ui.preferences; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferencePage; @@ -32,8 +33,6 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.ui.CUIPlugin; - /** * Preference page for work in progress. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/AlreadyExistsDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/AlreadyExistsDialog.java index f627cd9ac75..97d40783d76 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/AlreadyExistsDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/AlreadyExistsDialog.java @@ -14,6 +14,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences.formatter; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.preferences.formatter.ProfileManager.CustomProfile; +import org.eclipse.cdt.internal.ui.util.Messages; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.StatusDialog; @@ -31,10 +34,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.preferences.formatter.ProfileManager.CustomProfile; -import org.eclipse.cdt.internal.ui.util.Messages; - /** * The dialog to rename an imported profile. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/BracesTabPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/BracesTabPage.java index e55e648ab44..55f3524bb12 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/BracesTabPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/BracesTabPage.java @@ -18,12 +18,11 @@ import java.util.Map; import java.util.Observable; import java.util.Observer; +import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; -import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; - public class BracesTabPage extends FormatterTabPage { /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CPreview.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CPreview.java index a756e4af00d..55476a89f8e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CPreview.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CPreview.java @@ -18,6 +18,13 @@ package org.eclipse.cdt.internal.ui.preferences.formatter; import java.util.Map; +import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; +import org.eclipse.cdt.internal.ui.editor.CSourceViewer; +import org.eclipse.cdt.internal.ui.text.CTextTools; +import org.eclipse.cdt.internal.ui.text.SimpleCSourceViewerConfiguration; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.jface.preference.PreferenceStore; @@ -39,15 +46,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants; import org.eclipse.ui.texteditor.ChainedPreferenceStore; -import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.ICPartitions; - -import org.eclipse.cdt.internal.ui.editor.CSourceViewer; -import org.eclipse.cdt.internal.ui.text.CTextTools; -import org.eclipse.cdt.internal.ui.text.SimpleCSourceViewerConfiguration; - /** * Abstract previewer for C/C++ source code formatting. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CodeFormatterConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CodeFormatterConfigurationBlock.java index 8e4a615c73b..b962831d8a2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CodeFormatterConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CodeFormatterConfigurationBlock.java @@ -20,17 +20,15 @@ import java.util.List; import java.util.Observable; import java.util.Observer; +import org.eclipse.cdt.internal.ui.preferences.PreferencesAccess; +import org.eclipse.cdt.internal.ui.preferences.formatter.ProfileManager.Profile; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.preferences.IScopeContext; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.preferences.PreferencesAccess; -import org.eclipse.cdt.internal.ui.preferences.formatter.ProfileManager.Profile; - /** * The code formatter preference page. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CommentsTabPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CommentsTabPage.java index d0b1c6c8ba9..70660e6d287 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CommentsTabPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CommentsTabPage.java @@ -16,11 +16,10 @@ package org.eclipse.cdt.internal.ui.preferences.formatter; import java.util.Map; +import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; -import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; - /** * Tab page for the comment formatter settings. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ControlStatementsTabPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ControlStatementsTabPage.java index 2474217ea38..a3ad054e457 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ControlStatementsTabPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ControlStatementsTabPage.java @@ -17,14 +17,13 @@ import java.util.Map; import java.util.Observable; import java.util.Observer; +import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; -import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; - public class ControlStatementsTabPage extends FormatterTabPage { private final String PREVIEW = createPreviewHeader(FormatterMessages.ControlStatementsTabPage_preview_header) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CreateProfileDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CreateProfileDialog.java index 3ca30928c3e..0e49a80617c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CreateProfileDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CreateProfileDialog.java @@ -19,6 +19,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.preferences.formatter.ProfileManager.CustomProfile; +import org.eclipse.cdt.internal.ui.preferences.formatter.ProfileManager.Profile; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.IDialogSettings; @@ -38,12 +42,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.preferences.formatter.ProfileManager.CustomProfile; -import org.eclipse.cdt.internal.ui.preferences.formatter.ProfileManager.Profile; - /** * The dialog to create a new profile. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CustomCodeFormatterBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CustomCodeFormatterBlock.java index 44786b0afec..f2ac9fdaca2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CustomCodeFormatterBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CustomCodeFormatterBlock.java @@ -19,6 +19,12 @@ import java.util.HashMap; import java.util.Map; import java.util.Observable; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.CCorePreferenceConstants; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.preferences.PreferencesAccess; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtension; @@ -36,14 +42,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.CCorePreferenceConstants; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.utils.ui.controls.ControlFactory; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.preferences.PreferencesAccess; - /** * Allows to choose the formatter in a combo box. * If no formatter is contributed, nothing is shown. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterModifyDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterModifyDialog.java index ae0237496b1..5838b0bc7b9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterModifyDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterModifyDialog.java @@ -17,9 +17,8 @@ package org.eclipse.cdt.internal.ui.preferences.formatter; import java.util.Map; -import org.eclipse.swt.widgets.Shell; - import org.eclipse.cdt.internal.ui.preferences.formatter.ProfileManager.Profile; +import org.eclipse.swt.widgets.Shell; public class FormatterModifyDialog extends ModifyDialog { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterProfileManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterProfileManager.java index b7f993bbb5f..d453f64a3d4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterProfileManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterProfileManager.java @@ -20,16 +20,14 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.preferences.DefaultScope; -import org.eclipse.core.runtime.preferences.IScopeContext; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; +import org.eclipse.cdt.internal.ui.preferences.PreferencesAccess; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.PreferenceConstants; - -import org.eclipse.cdt.internal.ui.preferences.PreferencesAccess; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.preferences.DefaultScope; +import org.eclipse.core.runtime.preferences.IScopeContext; public class FormatterProfileManager extends ProfileManager { private static final List<String> EMPTY_LIST = Collections.emptyList(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterProfileStore.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterProfileStore.java index 61f4ea0e373..6eb383f0d57 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterProfileStore.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterProfileStore.java @@ -17,15 +17,13 @@ package org.eclipse.cdt.internal.ui.preferences.formatter; import java.util.List; +import org.eclipse.cdt.internal.ui.preferences.formatter.ProfileManager.Profile; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.core.runtime.preferences.IScopeContext; import org.osgi.service.prefs.BackingStoreException; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.preferences.formatter.ProfileManager.Profile; - public class FormatterProfileStore extends ProfileStore { /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterTabPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterTabPage.java index 610ea3dcfd6..a14abc26a0b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterTabPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterTabPage.java @@ -17,6 +17,9 @@ package org.eclipse.cdt.internal.ui.preferences.formatter; import java.util.Map; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -25,10 +28,6 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; -import org.eclipse.cdt.ui.CUIPlugin; - public abstract class FormatterTabPage extends ModifyDialogTabPage { private final static String SHOW_INVISIBLE_PREFERENCE_KEY = CUIPlugin.PLUGIN_ID + ".formatter_page.show_invisible_characters"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/IndentationTabPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/IndentationTabPage.java index 58239d5d012..410a14c6cc6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/IndentationTabPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/IndentationTabPage.java @@ -20,13 +20,12 @@ import java.util.Map; import java.util.Observable; import java.util.Observer; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; import org.eclipse.core.runtime.Assert; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; - public class IndentationTabPage extends FormatterTabPage { /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/LineWrappingTabPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/LineWrappingTabPage.java index 40c62a997d0..e7bd57fb3c0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/LineWrappingTabPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/LineWrappingTabPage.java @@ -24,6 +24,9 @@ import java.util.Map; import java.util.Observable; import java.util.Observer; +import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; +import org.eclipse.cdt.internal.corext.util.Messages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.IDialogSettings; @@ -49,11 +52,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; -import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.corext.util.Messages; - /** * The line wrapping tab page. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ModifyDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ModifyDialog.java index 98d78212d67..b6c53a9059e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ModifyDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ModifyDialog.java @@ -23,6 +23,15 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.preferences.formatter.ProfileManager.CustomProfile; +import org.eclipse.cdt.internal.ui.preferences.formatter.ProfileManager.Profile; +import org.eclipse.cdt.internal.ui.util.ExceptionHandler; +import org.eclipse.cdt.internal.ui.util.Messages; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringDialogField; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; @@ -48,17 +57,6 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.TabFolder; import org.eclipse.swt.widgets.TabItem; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.preferences.formatter.ProfileManager.CustomProfile; -import org.eclipse.cdt.internal.ui.preferences.formatter.ProfileManager.Profile; -import org.eclipse.cdt.internal.ui.util.ExceptionHandler; -import org.eclipse.cdt.internal.ui.util.Messages; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringDialogField; - public abstract class ModifyDialog extends StatusDialog implements IModifyDialogTabPage.IModificationListener { /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ModifyDialogTabPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ModifyDialogTabPage.java index 77e23636401..ec7e2d02deb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ModifyDialogTabPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ModifyDialogTabPage.java @@ -22,6 +22,8 @@ import java.util.Map; import java.util.Observable; import java.util.Observer; +import org.eclipse.cdt.internal.ui.util.Messages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.IDialogConstants; @@ -52,10 +54,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Layout; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.util.Messages; - public abstract class ModifyDialogTabPage implements IModifyDialogTabPage { /** * This is the default listener for any of the Preference diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/NewLinesTabPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/NewLinesTabPage.java index 32378e1ec4a..b046031eadc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/NewLinesTabPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/NewLinesTabPage.java @@ -16,11 +16,10 @@ package org.eclipse.cdt.internal.ui.preferences.formatter; import java.util.Map; +import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; -import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; - public class NewLinesTabPage extends FormatterTabPage { private final String PREVIEW = createPreviewHeader(FormatterMessages.NewLinesTabPage_preview_header) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileConfigurationBlock.java index bd7f082156c..25d19714f3f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileConfigurationBlock.java @@ -21,6 +21,14 @@ import java.util.List; import java.util.Observable; import java.util.Observer; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.internal.corext.util.Messages; +import org.eclipse.cdt.internal.ui.preferences.PreferencesAccess; +import org.eclipse.cdt.internal.ui.preferences.formatter.ProfileManager.CustomProfile; +import org.eclipse.cdt.internal.ui.preferences.formatter.ProfileManager.Profile; +import org.eclipse.cdt.internal.ui.util.ExceptionHandler; +import org.eclipse.cdt.internal.ui.util.SWTUtil; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ProjectScope; import org.eclipse.core.runtime.CoreException; @@ -44,17 +52,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.osgi.service.prefs.BackingStoreException; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.corext.util.Messages; - -import org.eclipse.cdt.internal.ui.preferences.PreferencesAccess; -import org.eclipse.cdt.internal.ui.preferences.formatter.ProfileManager.CustomProfile; -import org.eclipse.cdt.internal.ui.preferences.formatter.ProfileManager.Profile; -import org.eclipse.cdt.internal.ui.util.ExceptionHandler; -import org.eclipse.cdt.internal.ui.util.SWTUtil; - public abstract class ProfileConfigurationBlock { private class StoreUpdater implements Observer { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileManager.java index 646c717af06..a5ae96512f2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileManager.java @@ -23,6 +23,9 @@ import java.util.List; import java.util.Map; import java.util.Observable; +import org.eclipse.cdt.internal.ui.preferences.PreferencesAccess; +import org.eclipse.cdt.internal.ui.util.Messages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ProjectScope; import org.eclipse.core.resources.ResourcesPlugin; @@ -33,11 +36,6 @@ import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.osgi.util.TextProcessor; import org.osgi.service.prefs.BackingStoreException; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.preferences.PreferencesAccess; -import org.eclipse.cdt.internal.ui.util.Messages; - /** * The model for the set of profiles which are available in the workbench. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileStore.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileStore.java index f9ebe1e65ef..597771ab9c3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileStore.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileStore.java @@ -43,6 +43,11 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; +import org.eclipse.cdt.internal.ui.CUIException; +import org.eclipse.cdt.internal.ui.CUIStatus; +import org.eclipse.cdt.internal.ui.preferences.formatter.ProfileManager.CustomProfile; +import org.eclipse.cdt.internal.ui.preferences.formatter.ProfileManager.Profile; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.preferences.IEclipsePreferences; @@ -54,13 +59,6 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.CUIException; -import org.eclipse.cdt.internal.ui.CUIStatus; -import org.eclipse.cdt.internal.ui.preferences.formatter.ProfileManager.CustomProfile; -import org.eclipse.cdt.internal.ui.preferences.formatter.ProfileManager.Profile; - public class ProfileStore { /** The default encoding to use */ public static final String ENCODING = "UTF-8"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/SnippetPreview.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/SnippetPreview.java index 1234c462a31..ec75985f893 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/SnippetPreview.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/SnippetPreview.java @@ -18,18 +18,15 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Map; +import org.eclipse.cdt.internal.corext.util.CodeFormatterUtil; +import org.eclipse.cdt.internal.ui.ICStatusConstants; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.text.Document; import org.eclipse.swt.widgets.Composite; import org.eclipse.text.edits.TextEdit; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.corext.util.CodeFormatterUtil; - -import org.eclipse.cdt.internal.ui.ICStatusConstants; - public class SnippetPreview extends CPreview { public final static class PreviewSnippet { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/TranslationUnitPreview.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/TranslationUnitPreview.java index 99d8c5e76ab..b7a281f266a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/TranslationUnitPreview.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/TranslationUnitPreview.java @@ -18,6 +18,9 @@ package org.eclipse.cdt.internal.ui.preferences.formatter; import java.util.HashMap; import java.util.Map; +import org.eclipse.cdt.core.CCorePreferenceConstants; +import org.eclipse.cdt.internal.ui.ICStatusConstants; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.text.Region; @@ -28,11 +31,6 @@ import org.eclipse.jface.text.formatter.IContentFormatterExtension; import org.eclipse.jface.text.formatter.IFormattingContext; import org.eclipse.swt.widgets.Composite; -import org.eclipse.cdt.core.CCorePreferenceConstants; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.ICStatusConstants; - public class TranslationUnitPreview extends CPreview { private String fPreviewText; private int fPreviewTextOffset; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/WhiteSpaceOptions.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/WhiteSpaceOptions.java index 420769dae83..66afa66eb86 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/WhiteSpaceOptions.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/WhiteSpaceOptions.java @@ -23,7 +23,6 @@ import java.util.Map; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.formatter.CodeFormatter; import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; - import org.eclipse.cdt.internal.ui.preferences.formatter.SnippetPreview.PreviewSnippet; /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/WhiteSpaceTabPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/WhiteSpaceTabPage.java index b97792c0b29..6111e3e8eab 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/WhiteSpaceTabPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/WhiteSpaceTabPage.java @@ -19,6 +19,10 @@ import java.util.Collection; import java.util.List; import java.util.Map; +import org.eclipse.cdt.internal.ui.preferences.formatter.WhiteSpaceOptions.InnerNode; +import org.eclipse.cdt.internal.ui.preferences.formatter.WhiteSpaceOptions.Node; +import org.eclipse.cdt.internal.ui.preferences.formatter.WhiteSpaceOptions.OptionNode; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.CheckStateChangedEvent; @@ -46,12 +50,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.dialogs.ContainerCheckedTreeViewer; import org.eclipse.ui.part.PageBook; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.preferences.formatter.WhiteSpaceOptions.InnerNode; -import org.eclipse.cdt.internal.ui.preferences.formatter.WhiteSpaceOptions.Node; -import org.eclipse.cdt.internal.ui.preferences.formatter.WhiteSpaceOptions.OptionNode; - public class WhiteSpaceTabPage extends FormatterTabPage { /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoring.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoring.java index d49b74be64b..002c53a4f52 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoring.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoring.java @@ -18,25 +18,6 @@ package org.eclipse.cdt.internal.ui.refactoring; import java.util.ArrayList; import java.util.List; -import org.eclipse.core.resources.mapping.IResourceChangeDescriptionFactory; -import org.eclipse.core.runtime.Assert; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.SubMonitor; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.text.Region; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.ltk.core.refactoring.Change; -import org.eclipse.ltk.core.refactoring.Refactoring; -import org.eclipse.ltk.core.refactoring.RefactoringChangeDescriptor; -import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; -import org.eclipse.ltk.core.refactoring.RefactoringStatus; -import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; -import org.eclipse.ltk.core.refactoring.participants.ResourceChangeChecker; -import org.eclipse.ltk.core.refactoring.participants.ValidateEditChecker; -import org.eclipse.osgi.util.NLS; - import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTDeclaration; import org.eclipse.cdt.core.dom.ast.IASTExpression; @@ -57,12 +38,28 @@ import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ISourceRange; import org.eclipse.cdt.core.model.ISourceReference; import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.corext.util.CModelUtil; - import org.eclipse.cdt.internal.ui.refactoring.changes.CCompositeChange; import org.eclipse.cdt.internal.ui.refactoring.utils.SelectionHelper; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.resources.mapping.IResourceChangeDescriptionFactory; +import org.eclipse.core.runtime.Assert; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.core.runtime.SubMonitor; +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.jface.text.Region; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.ltk.core.refactoring.Change; +import org.eclipse.ltk.core.refactoring.Refactoring; +import org.eclipse.ltk.core.refactoring.RefactoringChangeDescriptor; +import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; +import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; +import org.eclipse.ltk.core.refactoring.participants.ResourceChangeChecker; +import org.eclipse.ltk.core.refactoring.participants.ValidateEditChecker; +import org.eclipse.osgi.util.NLS; /** * The base class for all AST based refactorings, provides some common implementations for diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoringContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoringContext.java index 229c4292150..536dca7d6ae 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoringContext.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoringContext.java @@ -17,11 +17,6 @@ package org.eclipse.cdt.internal.ui.refactoring; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.ltk.core.refactoring.RefactoringContext; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.index.IIndex; @@ -29,11 +24,13 @@ import org.eclipse.cdt.core.index.IIndexManager; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.corext.util.CModelUtil; - import org.eclipse.cdt.internal.ui.editor.ASTProvider; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.ltk.core.refactoring.RefactoringContext; /** * A disposable context for C/C++ refactoring operations. Contains cache of ASTs of the translation diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoringDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoringDescriptor.java index fce47442580..c8f15681e23 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoringDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoringDescriptor.java @@ -19,6 +19,12 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.Map; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.CoreModelUtil; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.core.resources.ResourceLookup; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; @@ -31,14 +37,6 @@ import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; import org.eclipse.ltk.core.refactoring.RefactoringStatus; import org.eclipse.osgi.util.NLS; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.CoreModelUtil; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.core.resources.ResourceLookup; - /** * @author Emanuel Graf IFS */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CTextFileChangeFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CTextFileChangeFactory.java index fe224b3cb59..6c52245aede 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CTextFileChangeFactory.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CTextFileChangeFactory.java @@ -13,13 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring; +import org.eclipse.cdt.internal.core.dom.rewrite.ICTextFileChangeFactory; +import org.eclipse.cdt.ui.refactoring.CTextFileChange; import org.eclipse.core.resources.IFile; import org.eclipse.ltk.core.refactoring.TextFileChange; -import org.eclipse.cdt.ui.refactoring.CTextFileChange; - -import org.eclipse.cdt.internal.core.dom.rewrite.ICTextFileChangeFactory; - /** * Factory provided to the core plugin to create appropriate text file changes. * @since 5.0 diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/ChangeExceptionHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/ChangeExceptionHandler.java index 8a16c0ebea0..2391ddf4b4c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/ChangeExceptionHandler.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/ChangeExceptionHandler.java @@ -16,37 +16,31 @@ package org.eclipse.cdt.internal.ui.refactoring; import java.lang.reflect.InvocationTargetException; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Shell; - +import org.eclipse.cdt.internal.ui.actions.WorkbenchRunnableAdapter; +import org.eclipse.cdt.internal.ui.util.ExceptionHandler; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.resources.IWorkspaceRunnable; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.ProgressMonitorWrapper; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubProgressMonitor; - -import org.eclipse.core.resources.IWorkspaceRunnable; -import org.eclipse.core.resources.ResourcesPlugin; - import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.ProgressMonitorDialog; - import org.eclipse.ltk.core.refactoring.Change; import org.eclipse.ltk.core.refactoring.CompositeChange; import org.eclipse.ltk.core.refactoring.Refactoring; import org.eclipse.osgi.util.NLS; - -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.actions.WorkbenchRunnableAdapter; -import org.eclipse.cdt.internal.ui.util.ExceptionHandler; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; /** * Copy of org.eclipse.ltk.internal.ui.refactoring.ChangeExceptionHandler diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/ChangeParametersControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/ChangeParametersControl.java index b1dd0f065f8..2d613137201 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/ChangeParametersControl.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/ChangeParametersControl.java @@ -22,6 +22,11 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import org.eclipse.cdt.internal.corext.codemanipulation.StubUtility; +import org.eclipse.cdt.internal.ui.dialogs.TableTextCellEditor; +import org.eclipse.cdt.internal.ui.dialogs.TextFieldNavigationHandler; +import org.eclipse.cdt.internal.ui.util.SWTUtil; +import org.eclipse.cdt.internal.ui.util.TableLayoutComposite; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.contentassist.SubjectControlContentAssistant; import org.eclipse.jface.resource.JFaceResources; @@ -62,13 +67,6 @@ import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.contentassist.ContentAssistHandler; -import org.eclipse.cdt.internal.corext.codemanipulation.StubUtility; - -import org.eclipse.cdt.internal.ui.dialogs.TableTextCellEditor; -import org.eclipse.cdt.internal.ui.dialogs.TextFieldNavigationHandler; -import org.eclipse.cdt.internal.ui.util.SWTUtil; -import org.eclipse.cdt.internal.ui.util.TableLayoutComposite; - /** * A special control to edit and reorder method parameters. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/ChangeTreeSet.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/ChangeTreeSet.java index 50d8bc9a875..c0bd74049cb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/ChangeTreeSet.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/ChangeTreeSet.java @@ -17,11 +17,10 @@ package org.eclipse.cdt.internal.ui.refactoring; import java.util.Comparator; import java.util.TreeSet; +import org.eclipse.cdt.ui.refactoring.CTextFileChange; import org.eclipse.ltk.core.refactoring.Change; import org.eclipse.ltk.core.refactoring.CompositeChange; -import org.eclipse.cdt.ui.refactoring.CTextFileChange; - /** * @author Emanuel Graf */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/ClassMemberInserter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/ClassMemberInserter.java index e4598bccafb..f3be1fc112d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/ClassMemberInserter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/ClassMemberInserter.java @@ -19,12 +19,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.preferences.IPreferencesService; -import org.eclipse.osgi.util.NLS; -import org.eclipse.text.edits.TextEditGroup; - import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; import org.eclipse.cdt.core.dom.ast.IASTDeclaration; import org.eclipse.cdt.core.dom.ast.IASTDeclarator; @@ -37,12 +31,15 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFunctionDefinition; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTVisibilityLabel; import org.eclipse.cdt.core.dom.rewrite.ASTRewrite; import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; - import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTVisibilityLabel; - import org.eclipse.cdt.internal.ui.refactoring.utils.VisibilityEnum; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.preferences.IPreferencesService; +import org.eclipse.osgi.util.NLS; +import org.eclipse.text.edits.TextEditGroup; /** * Adds a declaration to an existing class via the ModificationCollector. Automatically determines diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/DocumentAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/DocumentAdapter.java index 9043ae728c4..3e2df59de98 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/DocumentAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/DocumentAdapter.java @@ -20,6 +20,15 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import org.eclipse.cdt.core.model.BufferChangedEvent; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.IBuffer; +import org.eclipse.cdt.core.model.IBufferChangedListener; +import org.eclipse.cdt.core.model.IOpenable; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.cdt.internal.core.model.IBufferFactory; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.filebuffers.FileBuffers; import org.eclipse.core.filebuffers.ITextFileBuffer; import org.eclipse.core.filebuffers.ITextFileBufferManager; @@ -41,17 +50,6 @@ import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IDocumentListener; import org.eclipse.swt.widgets.Display; -import org.eclipse.cdt.core.model.BufferChangedEvent; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.IBuffer; -import org.eclipse.cdt.core.model.IBufferChangedListener; -import org.eclipse.cdt.core.model.IOpenable; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.core.model.IBufferFactory; - /** * Adapts <code>IDocument</code> to <code>IBuffer</code>. Uses the * same algorithm as the text widget to determine the buffer's line delimiter. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/IndexToASTNameHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/IndexToASTNameHelper.java index 14e967c2d51..c32dae7cfbb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/IndexToASTNameHelper.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/IndexToASTNameHelper.java @@ -17,8 +17,6 @@ package org.eclipse.cdt.internal.ui.refactoring; import java.util.ArrayList; import java.util.List; -import org.eclipse.core.runtime.CoreException; - import org.eclipse.cdt.core.dom.IName; import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTFileLocation; @@ -29,6 +27,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTQualifiedName; import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.index.IIndexName; import org.eclipse.cdt.core.parser.util.CharArrayUtils; +import org.eclipse.core.runtime.CoreException; public class IndexToASTNameHelper { public static List<IASTName> findNamesIn(IASTTranslationUnit tu, IBinding binding, IIndex index) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/MethodContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/MethodContext.java index 58ab243e65b..64fe0205f65 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/MethodContext.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/MethodContext.java @@ -26,7 +26,6 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNameSpecifier; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTQualifiedName; import org.eclipse.cdt.core.dom.ast.cpp.ICPPBase; import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType; - import org.eclipse.cdt.internal.core.dom.parser.ASTInternal; import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/ModificationCollector.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/ModificationCollector.java index 612bf0e3779..6ead9e14a7b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/ModificationCollector.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/ModificationCollector.java @@ -20,16 +20,14 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.mapping.IResourceChangeDescriptionFactory; -import org.eclipse.ltk.core.refactoring.Change; -import org.eclipse.ltk.core.refactoring.CompositeChange; - import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.rewrite.ASTRewrite; - import org.eclipse.cdt.internal.ui.refactoring.changes.CCompositeChange; import org.eclipse.cdt.internal.ui.refactoring.changes.CreateFileChange; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.mapping.IResourceChangeDescriptionFactory; +import org.eclipse.ltk.core.refactoring.Change; +import org.eclipse.ltk.core.refactoring.CompositeChange; /** * A ModificationCollector can be passed through a refactoring and manages the rewriters diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/NameInformation.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/NameInformation.java index 372e1dedf5a..9fdfd5f014d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/NameInformation.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/NameInformation.java @@ -18,8 +18,6 @@ package org.eclipse.cdt.internal.ui.refactoring; import java.util.ArrayList; import java.util.List; -import org.eclipse.core.runtime.Assert; - import org.eclipse.cdt.core.dom.ast.IASTArrayDeclarator; import org.eclipse.cdt.core.dom.ast.IASTArrayModifier; import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier; @@ -40,9 +38,9 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPNodeFactory; import org.eclipse.cdt.core.dom.rewrite.DeclarationGenerator; import org.eclipse.cdt.core.dom.rewrite.TypeHelper; import org.eclipse.cdt.core.model.ITranslationUnit; - import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; import org.eclipse.cdt.internal.core.dom.rewrite.astwriter.ASTWriterVisitor; +import org.eclipse.core.runtime.Assert; /** * Additional information about an IASTName in code being refactored. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/NodeContainer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/NodeContainer.java index e3a3fba74bb..276119220d6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/NodeContainer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/NodeContainer.java @@ -22,12 +22,6 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.preferences.IPreferencesService; - import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.DOMException; import org.eclipse.cdt.core.dom.ast.IASTDeclarator; @@ -45,9 +39,6 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTReferenceOperator; import org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding; import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateTypeParameter; import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; - import org.eclipse.cdt.internal.core.dom.parser.ASTInternal; import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVariableReadWriteFlags; @@ -57,6 +48,13 @@ import org.eclipse.cdt.internal.corext.refactoring.code.flow.FlowContext; import org.eclipse.cdt.internal.corext.refactoring.code.flow.FlowInfo; import org.eclipse.cdt.internal.corext.refactoring.code.flow.InputFlowAnalyzer; import org.eclipse.cdt.internal.corext.refactoring.code.flow.Selection; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.preferences.IPreferencesService; public class NodeContainer { private final List<IASTNode> nodes; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/ParameterEditDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/ParameterEditDialog.java index 3c36bdc471c..3874414ae5b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/ParameterEditDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/ParameterEditDialog.java @@ -14,6 +14,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring; +import org.eclipse.cdt.core.CConventions; +import org.eclipse.cdt.internal.ui.dialogs.TextFieldNavigationHandler; +import org.eclipse.cdt.internal.ui.viewsupport.BasicElementLabels; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.StatusDialog; @@ -30,12 +34,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.core.CConventions; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.dialogs.TextFieldNavigationHandler; -import org.eclipse.cdt.internal.ui.viewsupport.BasicElementLabels; - public class ParameterEditDialog extends StatusDialog { private final NameInformation fParameter; private final boolean fEditType; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/RefactoringExecutionHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/RefactoringExecutionHelper.java index 9dcda5bfd2f..ab37d9efbdc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/RefactoringExecutionHelper.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/RefactoringExecutionHelper.java @@ -16,10 +16,9 @@ package org.eclipse.cdt.internal.ui.refactoring; import java.lang.reflect.InvocationTargetException; -import org.eclipse.swt.custom.BusyIndicator; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; - +import org.eclipse.cdt.internal.ui.actions.WorkbenchRunnableAdapter; +import org.eclipse.core.resources.IWorkspaceRunnable; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; @@ -28,15 +27,10 @@ import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.core.runtime.jobs.IJobManager; import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.core.runtime.jobs.Job; - -import org.eclipse.core.resources.IWorkspaceRunnable; -import org.eclipse.core.resources.ResourcesPlugin; - import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.operation.IRunnableContext; - import org.eclipse.ltk.core.refactoring.Change; import org.eclipse.ltk.core.refactoring.PerformChangeOperation; import org.eclipse.ltk.core.refactoring.Refactoring; @@ -44,8 +38,9 @@ import org.eclipse.ltk.core.refactoring.RefactoringCore; import org.eclipse.ltk.core.refactoring.RefactoringStatus; import org.eclipse.ltk.ui.refactoring.RefactoringUI; import org.eclipse.osgi.util.NLS; - -import org.eclipse.cdt.internal.ui.actions.WorkbenchRunnableAdapter; +import org.eclipse.swt.custom.BusyIndicator; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; /** * A helper class to execute a refactoring. The class takes care of pushing the diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/RefactoringRunner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/RefactoringRunner.java index be977029e4c..0c1f45cbf2d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/RefactoringRunner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/RefactoringRunner.java @@ -13,13 +13,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICProject; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.window.IShellProvider; import org.eclipse.ltk.ui.refactoring.RefactoringWizard; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICProject; - /** * Base class for all refactoring runners. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/RefactoringSaveHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/RefactoringSaveHelper.java index 73a8a4724f8..98c2bf5dc61 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/RefactoringSaveHelper.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/RefactoringSaveHelper.java @@ -17,6 +17,10 @@ package org.eclipse.cdt.internal.ui.refactoring; import java.lang.reflect.InvocationTargetException; import java.util.Arrays; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.internal.ui.util.ExceptionHandler; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.Assert; @@ -41,12 +45,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.GlobalBuildAction; import org.eclipse.ui.dialogs.ListDialog; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; - -import org.eclipse.cdt.internal.ui.util.EditorUtility; -import org.eclipse.cdt.internal.ui.util.ExceptionHandler; - /** * Helper to save dirty editors prior to starting a refactoring. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/RefactoringSavePreferences.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/RefactoringSavePreferences.java index da648f95426..857584f7ead 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/RefactoringSavePreferences.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/RefactoringSavePreferences.java @@ -14,10 +14,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring; -import org.eclipse.jface.preference.IPreferenceStore; - import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.jface.preference.IPreferenceStore; public class RefactoringSavePreferences { public static final String PREF_SAVE_ALL_EDITORS = PreferenceConstants.REFACTOR_SAVE_ALL_EDITORS; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/changes/AbstractCElementRenameChange.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/changes/AbstractCElementRenameChange.java index 82455978510..37a6fd35600 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/changes/AbstractCElementRenameChange.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/changes/AbstractCElementRenameChange.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.changes; +import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.Assert; @@ -24,8 +25,6 @@ import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.ltk.core.refactoring.Change; import org.eclipse.ltk.core.refactoring.resource.ResourceChange; -import org.eclipse.cdt.core.model.CoreModel; - public abstract class AbstractCElementRenameChange extends ResourceChange { private final String fNewName; private final String fOldName; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/changes/RenameTranslationUnitChange.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/changes/RenameTranslationUnitChange.java index 994189f5084..7bdf3f645a7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/changes/RenameTranslationUnitChange.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/changes/RenameTranslationUnitChange.java @@ -14,6 +14,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.changes; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.viewsupport.BasicElementLabels; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; @@ -21,11 +24,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.ltk.core.refactoring.Change; import org.eclipse.osgi.util.NLS; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ITranslationUnit; - -import org.eclipse.cdt.internal.ui.viewsupport.BasicElementLabels; - public final class RenameTranslationUnitChange extends AbstractCElementRenameChange { public RenameTranslationUnitChange(ITranslationUnit tu, String newName) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/changes/UndoCTextFileChange.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/changes/UndoCTextFileChange.java index f92c971a1d0..b5b917e9e70 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/changes/UndoCTextFileChange.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/changes/UndoCTextFileChange.java @@ -14,6 +14,13 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.changes; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.IBuffer; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.cdt.internal.core.model.TranslationUnit; +import org.eclipse.cdt.internal.ui.refactoring.DocumentAdapter; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; @@ -27,16 +34,6 @@ import org.eclipse.text.edits.MalformedTreeException; import org.eclipse.text.edits.TextEdit; import org.eclipse.text.edits.UndoEdit; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.IBuffer; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.core.model.TranslationUnit; - -import org.eclipse.cdt.internal.ui.refactoring.DocumentAdapter; - /** * UndoCTextFileChange that uses a working copy in order to generate CModel events. * @author janees diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/CTextEditChangePreviewViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/CTextEditChangePreviewViewer.java index e27e794eb59..9a2d4304716 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/CTextEditChangePreviewViewer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/CTextEditChangePreviewViewer.java @@ -18,6 +18,12 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; import java.io.UnsupportedEncodingException; +import org.eclipse.cdt.internal.ui.compare.CMergeViewer; +import org.eclipse.cdt.internal.ui.text.CTextTools; +import org.eclipse.cdt.ui.CElementLabelProvider; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.refactoring.CTextFileChange; +import org.eclipse.cdt.ui.text.CSourceViewerConfiguration; import org.eclipse.compare.CompareConfiguration; import org.eclipse.compare.CompareViewerPane; import org.eclipse.compare.IEncodedStreamContentAccessor; @@ -42,14 +48,6 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.cdt.ui.CElementLabelProvider; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.refactoring.CTextFileChange; -import org.eclipse.cdt.ui.text.CSourceViewerConfiguration; - -import org.eclipse.cdt.internal.ui.compare.CMergeViewer; -import org.eclipse.cdt.internal.ui.text.CTextTools; - /** * @author Emanuel Graf * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/CreateFileChangePreview.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/CreateFileChangePreview.java index 4a79a5e75af..066825805bd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/CreateFileChangePreview.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/CreateFileChangePreview.java @@ -14,6 +14,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.dialogs; +import org.eclipse.cdt.internal.ui.editor.CSourceViewer; +import org.eclipse.cdt.internal.ui.refactoring.changes.CreateFileChange; +import org.eclipse.cdt.internal.ui.text.CTextTools; +import org.eclipse.cdt.internal.ui.util.ViewerPane; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.CSourceViewerConfiguration; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.preference.IPreferenceStore; @@ -26,14 +32,6 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.CSourceViewerConfiguration; - -import org.eclipse.cdt.internal.ui.editor.CSourceViewer; -import org.eclipse.cdt.internal.ui.refactoring.changes.CreateFileChange; -import org.eclipse.cdt.internal.ui.text.CTextTools; -import org.eclipse.cdt.internal.ui.util.ViewerPane; - /** * @author Emanuel Graf */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/NameAndVisibilityComposite.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/NameAndVisibilityComposite.java index 5a31fd5f2fd..c5d4ca71b5b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/NameAndVisibilityComposite.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/NameAndVisibilityComposite.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.dialogs; +import org.eclipse.cdt.internal.ui.refactoring.utils.VisibilityEnum; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; @@ -22,8 +23,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.internal.ui.refactoring.utils.VisibilityEnum; - /** * Composite to query for a name and visibility. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/ValidatingLabeledTextField.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/ValidatingLabeledTextField.java index c06e12c6b97..4f7bb1d699d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/ValidatingLabeledTextField.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/ValidatingLabeledTextField.java @@ -19,6 +19,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import org.eclipse.cdt.internal.ui.refactoring.utils.NameHelper; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.swt.SWT; @@ -32,8 +33,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.internal.ui.refactoring.utils.NameHelper; - /** * @author Mirko Stocker * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/VisibilitySelectionPanel.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/VisibilitySelectionPanel.java index 12b90cd188b..ec16a294255 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/VisibilitySelectionPanel.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/VisibilitySelectionPanel.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.dialogs; +import org.eclipse.cdt.internal.ui.refactoring.utils.VisibilityEnum; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; @@ -22,8 +23,6 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; -import org.eclipse.cdt.internal.ui.refactoring.utils.VisibilityEnum; - /** * Three radio buttons in a group, labeled according to the corresponding visibility name * (public, private, protected). diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoring.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoring.java index 644faa1dbb3..b61e12d226c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoring.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoring.java @@ -23,17 +23,6 @@ import java.util.HashMap; import java.util.Map; import java.util.stream.Collectors; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.SubMonitor; -import org.eclipse.core.runtime.preferences.IPreferencesService; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; -import org.eclipse.ltk.core.refactoring.RefactoringStatus; -import org.eclipse.text.edits.TextEditGroup; - import org.eclipse.cdt.core.dom.ast.ASTNodeFactoryFactory; import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; @@ -60,11 +49,7 @@ import org.eclipse.cdt.core.dom.rewrite.ASTRewrite; import org.eclipse.cdt.core.dom.rewrite.DeclarationGenerator; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; - import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; - import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; import org.eclipse.cdt.internal.ui.refactoring.CRefactoringDescriptor; import org.eclipse.cdt.internal.ui.refactoring.ClassMemberInserter; @@ -74,6 +59,18 @@ import org.eclipse.cdt.internal.ui.refactoring.utils.IdentifierHelper; import org.eclipse.cdt.internal.ui.refactoring.utils.NodeHelper; import org.eclipse.cdt.internal.ui.refactoring.utils.SelectionHelper; import org.eclipse.cdt.internal.ui.util.NameComposer; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.SubMonitor; +import org.eclipse.core.runtime.preferences.IPreferencesService; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; +import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import org.eclipse.text.edits.TextEditGroup; /** * The main class of the Extract Constant refactoring. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoringContribution.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoringContribution.java index 96e99de9859..0fbf1bb8e01 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoringContribution.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoringContribution.java @@ -16,9 +16,8 @@ package org.eclipse.cdt.internal.ui.refactoring.extractconstant; import java.util.Map; -import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; - import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContribution; +import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; /** * @author Emanuel Graf IFS diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoringDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoringDescriptor.java index 26f45c70d43..038c8581560 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoringDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoringDescriptor.java @@ -18,16 +18,14 @@ package org.eclipse.cdt.internal.ui.refactoring.extractconstant; import java.util.Map; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; -import org.eclipse.ltk.core.refactoring.RefactoringStatus; - import org.eclipse.cdt.core.model.ICProject; - import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; import org.eclipse.cdt.internal.ui.refactoring.CRefactoringDescriptor; import org.eclipse.cdt.internal.ui.refactoring.utils.VisibilityEnum; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; +import org.eclipse.ltk.core.refactoring.RefactoringStatus; /** * @author Emanuel Graf IFS diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoringRunner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoringRunner.java index 4920fd12265..8950f6b0993 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoringRunner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoringRunner.java @@ -15,14 +15,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.extractconstant; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.window.IShellProvider; - import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; - import org.eclipse.cdt.internal.ui.refactoring.RefactoringRunner; import org.eclipse.cdt.internal.ui.refactoring.RefactoringSaveHelper; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.window.IShellProvider; /** * @author Emanuel Graf diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantWizard.java index 5b7dcc081b0..639e94a81b2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantWizard.java @@ -15,9 +15,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.extractconstant; -import org.eclipse.ltk.ui.refactoring.RefactoringWizard; - import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.ltk.ui.refactoring.RefactoringWizard; /** * The wizard page for Extract Constant refactoring, creates the UI page. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/InputPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/InputPage.java index 5b97a4a6a49..542175f523b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/InputPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/InputPage.java @@ -15,6 +15,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.extractconstant; +import org.eclipse.cdt.internal.ui.refactoring.MethodContext.ContextType; +import org.eclipse.cdt.internal.ui.refactoring.dialogs.NameAndVisibilityComposite; +import org.eclipse.cdt.internal.ui.refactoring.utils.IdentifierHelper; +import org.eclipse.cdt.internal.ui.refactoring.utils.IdentifierResult; +import org.eclipse.cdt.internal.ui.refactoring.utils.VisibilityEnum; import org.eclipse.ltk.ui.refactoring.UserInputWizardPage; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; @@ -28,12 +33,6 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.cdt.internal.ui.refactoring.MethodContext.ContextType; -import org.eclipse.cdt.internal.ui.refactoring.dialogs.NameAndVisibilityComposite; -import org.eclipse.cdt.internal.ui.refactoring.utils.IdentifierHelper; -import org.eclipse.cdt.internal.ui.refactoring.utils.IdentifierResult; -import org.eclipse.cdt.internal.ui.refactoring.utils.VisibilityEnum; - public class InputPage extends UserInputWizardPage { private static final String PAGE_NAME = "InputPage"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExpressionExtractor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExpressionExtractor.java index 2f5cbaf0a15..f8fbe8e2eb1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExpressionExtractor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExpressionExtractor.java @@ -19,8 +19,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.eclipse.text.edits.TextEditGroup; - import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement; @@ -42,12 +40,11 @@ import org.eclipse.cdt.core.dom.ast.IVariable; import org.eclipse.cdt.core.dom.rewrite.ASTRewrite; import org.eclipse.cdt.core.dom.rewrite.DeclarationGenerator; import org.eclipse.cdt.core.parser.util.ArrayUtil; - import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTBinaryExpression; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTReturnStatement; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPBasicType; - import org.eclipse.cdt.internal.ui.refactoring.NameInformation; +import org.eclipse.text.edits.TextEditGroup; /** * Handles the extraction of expression nodes, for example, return type determination. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionInformation.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionInformation.java index f1a8eb84d8a..c810cc7d8cd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionInformation.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionInformation.java @@ -24,7 +24,6 @@ import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier; import org.eclipse.cdt.core.dom.ast.IASTDeclarator; import org.eclipse.cdt.core.dom.ast.IASTPointerOperator; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFunctionDeclarator; - import org.eclipse.cdt.internal.ui.refactoring.MethodContext; import org.eclipse.cdt.internal.ui.refactoring.NameInformation; import org.eclipse.cdt.internal.ui.refactoring.utils.VisibilityEnum; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionInputPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionInputPage.java index 02e4e790586..365adba2816 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionInputPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionInputPage.java @@ -15,6 +15,21 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.extractfunction; +import org.eclipse.cdt.internal.corext.codemanipulation.StubUtility; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.dialogs.TextFieldNavigationHandler; +import org.eclipse.cdt.internal.ui.editor.CSourceViewer; +import org.eclipse.cdt.internal.ui.refactoring.ChangeParametersControl; +import org.eclipse.cdt.internal.ui.refactoring.ChangeParametersControl.Mode; +import org.eclipse.cdt.internal.ui.refactoring.IParameterListChangeListener; +import org.eclipse.cdt.internal.ui.refactoring.NameInformation; +import org.eclipse.cdt.internal.ui.refactoring.StubTypeContext; +import org.eclipse.cdt.internal.ui.refactoring.utils.VisibilityEnum; +import org.eclipse.cdt.internal.ui.util.RowLayouter; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.CSourceViewerConfiguration; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.layout.PixelConverter; @@ -38,24 +53,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.CSourceViewerConfiguration; - -import org.eclipse.cdt.internal.corext.codemanipulation.StubUtility; - -import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.dialogs.TextFieldNavigationHandler; -import org.eclipse.cdt.internal.ui.editor.CSourceViewer; -import org.eclipse.cdt.internal.ui.refactoring.ChangeParametersControl; -import org.eclipse.cdt.internal.ui.refactoring.ChangeParametersControl.Mode; -import org.eclipse.cdt.internal.ui.refactoring.IParameterListChangeListener; -import org.eclipse.cdt.internal.ui.refactoring.NameInformation; -import org.eclipse.cdt.internal.ui.refactoring.StubTypeContext; -import org.eclipse.cdt.internal.ui.refactoring.utils.VisibilityEnum; -import org.eclipse.cdt.internal.ui.util.RowLayouter; - public class ExtractFunctionInputPage extends UserInputWizardPage { public static final String PAGE_NAME = "ExtractFunctionInputPage"; //$NON-NLS-1$ static final String DIALOG_SETTING_SECTION = "ExtractFunctionWizard"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoring.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoring.java index 3d3b12116d4..b75ba36aaee 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoring.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoring.java @@ -24,19 +24,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.SubMonitor; -import org.eclipse.core.runtime.preferences.IPreferencesService; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; -import org.eclipse.ltk.core.refactoring.RefactoringStatus; -import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; -import org.eclipse.osgi.util.NLS; -import org.eclipse.text.edits.TextEditGroup; - import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.DOMException; import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; @@ -91,9 +78,6 @@ import org.eclipse.cdt.core.formatter.DefaultCodeFormatterOptions; import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; - import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; import org.eclipse.cdt.internal.core.dom.parser.c.CASTBinaryExpression; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTBinaryExpression; @@ -112,7 +96,6 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTSimpleDeclaration; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTTemplateDeclaration; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil; import org.eclipse.cdt.internal.core.dom.rewrite.astwriter.ASTWriterVisitor; - import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; import org.eclipse.cdt.internal.ui.refactoring.CRefactoringDescriptor; import org.eclipse.cdt.internal.ui.refactoring.ClassMemberInserter; @@ -130,6 +113,20 @@ import org.eclipse.cdt.internal.ui.refactoring.utils.Checks; import org.eclipse.cdt.internal.ui.refactoring.utils.NodeHelper; import org.eclipse.cdt.internal.ui.refactoring.utils.SelectionHelper; import org.eclipse.cdt.internal.ui.viewsupport.BasicElementLabels; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.SubMonitor; +import org.eclipse.core.runtime.preferences.IPreferencesService; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; +import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; +import org.eclipse.osgi.util.NLS; +import org.eclipse.text.edits.TextEditGroup; public class ExtractFunctionRefactoring extends CRefactoring { public static final String ID = "org.eclipse.cdt.internal.ui.refactoring.extractfunction.ExtractFunctionRefactoring"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoringContribution.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoringContribution.java index 2b4658b946d..1e51876bd0d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoringContribution.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoringContribution.java @@ -16,9 +16,8 @@ package org.eclipse.cdt.internal.ui.refactoring.extractfunction; import java.util.Map; -import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; - import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContribution; +import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; /** * @author Emanuel Graf IFS diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoringDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoringDescriptor.java index 8db271943cb..3fe1c04cef1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoringDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoringDescriptor.java @@ -17,16 +17,14 @@ package org.eclipse.cdt.internal.ui.refactoring.extractfunction; import java.util.Map; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; -import org.eclipse.ltk.core.refactoring.RefactoringStatus; - import org.eclipse.cdt.core.model.ICProject; - import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; import org.eclipse.cdt.internal.ui.refactoring.CRefactoringDescriptor; import org.eclipse.cdt.internal.ui.refactoring.utils.VisibilityEnum; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; +import org.eclipse.ltk.core.refactoring.RefactoringStatus; /** * @author Emanuel Graf IFS diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoringRunner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoringRunner.java index 3deb4d5eee9..bb8e12bc5e8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoringRunner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoringRunner.java @@ -15,14 +15,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.extractfunction; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.window.IShellProvider; - import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; - import org.eclipse.cdt.internal.ui.refactoring.RefactoringRunner; import org.eclipse.cdt.internal.ui.refactoring.RefactoringSaveHelper; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.window.IShellProvider; /** * @author Emanuel Graf diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionWizard.java index c0d7792f758..852b8a0f267 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionWizard.java @@ -15,9 +15,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.extractfunction; -import org.eclipse.ltk.ui.refactoring.RefactoringWizard; - import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.ltk.ui.refactoring.RefactoringWizard; public class ExtractFunctionWizard extends RefactoringWizard { public ExtractFunctionWizard(ExtractFunctionRefactoring refactoring) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/FunctionExtractor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/FunctionExtractor.java index 1903c1692f6..0e049c8c332 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/FunctionExtractor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/FunctionExtractor.java @@ -21,8 +21,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.eclipse.text.edits.TextEditGroup; - import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement; import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier; @@ -40,9 +38,9 @@ import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; import org.eclipse.cdt.core.dom.ast.INodeFactory; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFunctionDeclarator; import org.eclipse.cdt.core.dom.rewrite.ASTRewrite; - import org.eclipse.cdt.internal.ui.refactoring.NameInformation; import org.eclipse.cdt.internal.ui.refactoring.NameInformation.Indirection; +import org.eclipse.text.edits.TextEditGroup; /** * @author Mirko Stocker diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/SimilarFinderVisitor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/SimilarFinderVisitor.java index f63df0f3890..cb577825346 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/SimilarFinderVisitor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/SimilarFinderVisitor.java @@ -22,7 +22,6 @@ import java.util.Map.Entry; import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTStatement; - import org.eclipse.cdt.internal.ui.refactoring.NameInformation; import org.eclipse.cdt.internal.ui.refactoring.NodeContainer; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/SimilarReplacerVisitor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/SimilarReplacerVisitor.java index fac5a121d5a..eaf98b0fc70 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/SimilarReplacerVisitor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/SimilarReplacerVisitor.java @@ -15,14 +15,12 @@ package org.eclipse.cdt.internal.ui.refactoring.extractfunction; import java.util.List; -import org.eclipse.text.edits.TextEditGroup; - import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.rewrite.ASTRewrite; - import org.eclipse.cdt.internal.ui.refactoring.ModificationCollector; import org.eclipse.cdt.internal.ui.refactoring.NodeContainer; +import org.eclipse.text.edits.TextEditGroup; final class SimilarReplacerVisitor extends SimilarFinderVisitor { private final IASTName name; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/StatementExtractor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/StatementExtractor.java index 9f755bf1fc0..f387ca58987 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/StatementExtractor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/StatementExtractor.java @@ -18,8 +18,6 @@ package org.eclipse.cdt.internal.ui.refactoring.extractfunction; import java.util.List; import java.util.Map; -import org.eclipse.text.edits.TextEditGroup; - import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement; import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier; import org.eclipse.cdt.core.dom.ast.IASTDeclarator; @@ -32,11 +30,10 @@ import org.eclipse.cdt.core.dom.ast.IASTPointerOperator; import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclSpecifier; import org.eclipse.cdt.core.dom.ast.INodeFactory; import org.eclipse.cdt.core.dom.rewrite.ASTRewrite; - import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTSimpleDeclSpecifier; - import org.eclipse.cdt.internal.ui.refactoring.NameInformation; import org.eclipse.cdt.internal.ui.refactoring.utils.ASTHelper; +import org.eclipse.text.edits.TextEditGroup; /** * @author Mirko Stocker diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/TrailName.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/TrailName.java index c306041e58e..f8bc91d30a6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/TrailName.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/TrailName.java @@ -19,7 +19,6 @@ import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding; - import org.eclipse.cdt.internal.core.dom.parser.ASTNode; class TrailName extends ASTNode { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/TrailNodeEqualityChecker.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/TrailNodeEqualityChecker.java index a23db6f8a8f..51f6240a6ad 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/TrailNodeEqualityChecker.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/TrailNodeEqualityChecker.java @@ -19,8 +19,6 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import org.eclipse.core.runtime.CoreException; - import org.eclipse.cdt.core.dom.ast.IASTASMDeclaration; import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; @@ -66,10 +64,10 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTVisibilityLabel; import org.eclipse.cdt.core.dom.ast.cpp.ICPPVariable; import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.index.IIndexName; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.ui.refactoring.Container; import org.eclipse.cdt.internal.ui.refactoring.EqualityChecker; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.runtime.CoreException; public class TrailNodeEqualityChecker implements EqualityChecker<IASTNode> { private final Map<String, Integer> names; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoring.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoring.java index e1adb624af0..de9364071a3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoring.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoring.java @@ -20,18 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.SubMonitor; -import org.eclipse.core.runtime.preferences.IPreferencesService; -import org.eclipse.jface.text.Region; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; -import org.eclipse.ltk.core.refactoring.RefactoringStatus; -import org.eclipse.text.edits.TextEditGroup; - import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement; import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier; @@ -61,16 +49,12 @@ import org.eclipse.cdt.core.dom.rewrite.ASTRewrite; import org.eclipse.cdt.core.dom.rewrite.DeclarationGenerator; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; - import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTDeclarationStatement; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTEqualsInitializer; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTIdExpression; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTName; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPFunction; - import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; import org.eclipse.cdt.internal.ui.refactoring.CRefactoringDescriptor; import org.eclipse.cdt.internal.ui.refactoring.ModificationCollector; @@ -79,6 +63,19 @@ import org.eclipse.cdt.internal.ui.refactoring.VariableNameInformation; import org.eclipse.cdt.internal.ui.refactoring.utils.NodeHelper; import org.eclipse.cdt.internal.ui.refactoring.utils.SelectionHelper; import org.eclipse.cdt.internal.ui.util.NameComposer; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.SubMonitor; +import org.eclipse.core.runtime.preferences.IPreferencesService; +import org.eclipse.jface.text.Region; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; +import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import org.eclipse.text.edits.TextEditGroup; /** * The main class for the Extract Local Variable refactoring. This refactoring diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoringContribution.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoringContribution.java index 66e1afbde0c..42b2185e94f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoringContribution.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoringContribution.java @@ -16,9 +16,8 @@ package org.eclipse.cdt.internal.ui.refactoring.extractlocalvariable; import java.util.Map; -import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; - import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContribution; +import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; /** * @author Emanuel Graf IFS diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoringDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoringDescriptor.java index bb76c899aaa..99d04bb1dc6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoringDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoringDescriptor.java @@ -17,16 +17,14 @@ package org.eclipse.cdt.internal.ui.refactoring.extractlocalvariable; import java.util.Map; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; +import org.eclipse.cdt.internal.ui.refactoring.CRefactoringDescriptor; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.viewers.ISelection; import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; import org.eclipse.ltk.core.refactoring.RefactoringStatus; -import org.eclipse.cdt.core.model.ICProject; - -import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; -import org.eclipse.cdt.internal.ui.refactoring.CRefactoringDescriptor; - /** * @author Emanuel Graf IFS */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoringRunner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoringRunner.java index b1f49212580..6a7dc123edf 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoringRunner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoringRunner.java @@ -15,14 +15,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.extractlocalvariable; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.window.IShellProvider; - import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; - import org.eclipse.cdt.internal.ui.refactoring.RefactoringRunner; import org.eclipse.cdt.internal.ui.refactoring.RefactoringSaveHelper; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.window.IShellProvider; /** * Extract Local Variable refactoring runner. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableWizard.java index 3f0124be325..5900b921c01 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableWizard.java @@ -15,9 +15,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.extractlocalvariable; -import org.eclipse.ltk.ui.refactoring.RefactoringWizard; - import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.ltk.ui.refactoring.RefactoringWizard; /** * The wizard page for Extract Local Variable refactoring, creates the UI page. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/InputPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/InputPage.java index bc647433220..9eeda142895 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/InputPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/InputPage.java @@ -16,6 +16,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.extractlocalvariable; +import org.eclipse.cdt.internal.ui.refactoring.VariableNameInformation; +import org.eclipse.cdt.internal.ui.refactoring.dialogs.LabeledTextField; +import org.eclipse.cdt.internal.ui.refactoring.utils.IdentifierHelper; +import org.eclipse.cdt.internal.ui.refactoring.utils.IdentifierResult; import org.eclipse.ltk.ui.refactoring.UserInputWizardPage; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; @@ -26,11 +30,6 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.internal.ui.refactoring.VariableNameInformation; -import org.eclipse.cdt.internal.ui.refactoring.dialogs.LabeledTextField; -import org.eclipse.cdt.internal.ui.refactoring.utils.IdentifierHelper; -import org.eclipse.cdt.internal.ui.refactoring.utils.IdentifierResult; - /** * Input verification page for the ExtractLocalVariable refactoring, cloned * from org.eclipse.cdt.internal.ui.refactoring.extractconstant.InputPage. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/AccessorDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/AccessorDescriptor.java index 51deb9c774a..5e95b478fd3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/AccessorDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/AccessorDescriptor.java @@ -14,12 +14,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.gettersandsetters; -import com.ibm.icu.text.Collator; - import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration; +import com.ibm.icu.text.Collator; + public class AccessorDescriptor implements Comparable<AccessorDescriptor> { public enum AccessorKind { GETTER, SETTER; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/AccessorFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/AccessorFactory.java index 57f25d8dcbe..e98ffe3e85d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/AccessorFactory.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/AccessorFactory.java @@ -34,7 +34,6 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTArrayDeclarator; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression; import org.eclipse.cdt.core.dom.rewrite.TypeHelper; import org.eclipse.cdt.core.parser.Keywords; - import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; import org.eclipse.cdt.internal.core.dom.parser.c.CASTDeclarator; import org.eclipse.cdt.internal.core.dom.parser.c.CASTPointer; @@ -55,7 +54,6 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTReturnStatement; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTSimpleDeclSpecifier; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTSimpleDeclaration; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; - import org.eclipse.cdt.internal.ui.refactoring.gettersandsetters.AccessorDescriptor.AccessorKind; public abstract class AccessorFactory { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/FieldDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/FieldDescriptor.java index ab26ba31564..7a28555ca5a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/FieldDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/FieldDescriptor.java @@ -29,9 +29,7 @@ import org.eclipse.cdt.core.dom.ast.IQualifierType; import org.eclipse.cdt.core.dom.ast.IType; import org.eclipse.cdt.core.dom.ast.cpp.ICPPField; import org.eclipse.cdt.core.dom.ast.cpp.ICPPReferenceType; - import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil; - import org.eclipse.cdt.internal.ui.refactoring.gettersandsetters.AccessorDescriptor.AccessorKind; class FieldDescriptor { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersInputPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersInputPage.java index ecfc4aa330d..cf18e8ba50a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersInputPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersInputPage.java @@ -14,6 +14,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.gettersandsetters; +import org.eclipse.cdt.internal.ui.preferences.NameStylePreferencePage; +import org.eclipse.cdt.internal.ui.refactoring.gettersandsetters.AccessorDescriptor.AccessorKind; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener; import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent; @@ -33,11 +36,6 @@ import org.eclipse.swt.widgets.Link; import org.eclipse.ui.dialogs.ContainerCheckedTreeViewer; import org.eclipse.ui.dialogs.PreferencesUtil; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.preferences.NameStylePreferencePage; -import org.eclipse.cdt.internal.ui.refactoring.gettersandsetters.AccessorDescriptor.AccessorKind; - public class GenerateGettersAndSettersInputPage extends UserInputWizardPage implements IPreferenceChangeListener { private GetterSetterContext context; private ContainerCheckedTreeViewer variableSelectionView; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersRefactoring.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersRefactoring.java index 620c538dd9b..67bf4606271 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersRefactoring.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersRefactoring.java @@ -19,16 +19,6 @@ package org.eclipse.cdt.internal.ui.refactoring.gettersandsetters; import java.util.ArrayList; import java.util.List; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.SubMonitor; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; -import org.eclipse.ltk.core.refactoring.RefactoringStatus; -import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; - import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier; @@ -45,11 +35,9 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier; import org.eclipse.cdt.core.dom.rewrite.ASTRewrite; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; - import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTName; import org.eclipse.cdt.internal.core.dom.rewrite.astwriter.ContainerNode; - import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; import org.eclipse.cdt.internal.ui.refactoring.ClassMemberInserter; import org.eclipse.cdt.internal.ui.refactoring.Container; @@ -60,6 +48,15 @@ import org.eclipse.cdt.internal.ui.refactoring.utils.Checks; import org.eclipse.cdt.internal.ui.refactoring.utils.NameHelper; import org.eclipse.cdt.internal.ui.refactoring.utils.NodeHelper; import org.eclipse.cdt.internal.ui.refactoring.utils.VisibilityEnum; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.core.runtime.SubMonitor; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; +import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; /** * @author Thomas Corbat diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersRefactoringRunner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersRefactoringRunner.java index ea141361bf1..f1103bef0b4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersRefactoringRunner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersRefactoringRunner.java @@ -15,6 +15,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.gettersandsetters; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.internal.ui.refactoring.RefactoringRunner; +import org.eclipse.cdt.internal.ui.refactoring.RefactoringSaveHelper; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.window.IShellProvider; import org.eclipse.ltk.ui.refactoring.RefactoringWizard; @@ -22,12 +26,6 @@ import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICProject; - -import org.eclipse.cdt.internal.ui.refactoring.RefactoringRunner; -import org.eclipse.cdt.internal.ui.refactoring.RefactoringSaveHelper; - /** * @author Thomas Corbat */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterContext.java index ce846390bc5..e6207f5c1ab 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterContext.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterContext.java @@ -20,15 +20,13 @@ import java.util.List; import java.util.SortedSet; import java.util.TreeSet; -import org.eclipse.jface.viewers.ITreeContentProvider; -import org.eclipse.jface.viewers.Viewer; - import org.eclipse.cdt.core.dom.ast.IASTDeclarator; import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration; - import org.eclipse.cdt.internal.ui.refactoring.gettersandsetters.AccessorDescriptor.AccessorKind; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.Viewer; public class GetterSetterContext implements ITreeContentProvider { final List<IASTDeclarator> existingFields = new ArrayList<IASTDeclarator>(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterLabelProvider.java index acf98a3f356..ee143b2edb0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterLabelProvider.java @@ -14,12 +14,10 @@ ******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.gettersandsetters; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.swt.graphics.Image; - import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; - import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.swt.graphics.Image; /** * @author Emanuel Graf IFS diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterNameGenerator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterNameGenerator.java index e7d0445e38f..38530599bbd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterNameGenerator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterNameGenerator.java @@ -22,11 +22,10 @@ import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IBasicType; import org.eclipse.cdt.core.dom.ast.IType; import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.PreferenceConstants; - import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil; import org.eclipse.cdt.internal.corext.codemanipulation.StubUtility; +import org.eclipse.cdt.ui.PreferenceConstants; public class GetterSetterNameGenerator { private static Set<String> generateGetterSettersPreferenceKeys = new HashSet<String>(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoring.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoring.java index 808ec1382bc..691bb01141a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoring.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoring.java @@ -22,18 +22,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.SubMonitor; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; -import org.eclipse.ltk.core.refactoring.RefactoringStatus; -import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; -import org.eclipse.text.edits.TextEditGroup; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorPart; - import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; import org.eclipse.cdt.core.dom.ast.IASTDeclaration; @@ -56,12 +44,10 @@ import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.parser.util.ArrayUtil; - import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.AccessContext; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; import org.eclipse.cdt.internal.corext.util.CModelUtil; - import org.eclipse.cdt.internal.ui.editor.ITranslationUnitEditorInput; import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; import org.eclipse.cdt.internal.ui.refactoring.CRefactoringDescriptor; @@ -71,6 +57,17 @@ import org.eclipse.cdt.internal.ui.refactoring.utils.DefinitionFinder; import org.eclipse.cdt.internal.ui.refactoring.utils.SelectionHelper; import org.eclipse.cdt.internal.ui.refactoring.utils.VisibilityEnum; import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.core.runtime.SubMonitor; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; +import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; +import org.eclipse.text.edits.TextEditGroup; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; /** * @author Guido Zgraggen IFS diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoringContribution.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoringContribution.java index 0e4763106a0..c3d2dc5be53 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoringContribution.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoringContribution.java @@ -16,9 +16,8 @@ package org.eclipse.cdt.internal.ui.refactoring.hidemethod; import java.util.Map; -import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; - import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContribution; +import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; /** * @author Emanuel Graf IFS diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoringDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoringDescriptor.java index 828b8008488..2f303ad4560 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoringDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoringDescriptor.java @@ -17,16 +17,14 @@ package org.eclipse.cdt.internal.ui.refactoring.hidemethod; import java.util.Map; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; +import org.eclipse.cdt.internal.ui.refactoring.CRefactoringDescriptor; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.viewers.ISelection; import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; import org.eclipse.ltk.core.refactoring.RefactoringStatus; -import org.eclipse.cdt.core.model.ICProject; - -import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; -import org.eclipse.cdt.internal.ui.refactoring.CRefactoringDescriptor; - /** * @author Emanuel Graf IFS */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoringRunner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoringRunner.java index 19d90ef2a20..f3466e26cbd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoringRunner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoringRunner.java @@ -15,14 +15,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.hidemethod; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.window.IShellProvider; - import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; - import org.eclipse.cdt.internal.ui.refactoring.RefactoringRunner; import org.eclipse.cdt.internal.ui.refactoring.RefactoringSaveHelper; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.window.IShellProvider; /** * @author Guido Zgraggen IFS diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ImplementMethodData.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ImplementMethodData.java index 4c1b7d11f86..183beafda38 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ImplementMethodData.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ImplementMethodData.java @@ -17,11 +17,10 @@ package org.eclipse.cdt.internal.ui.refactoring.implementmethod; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration; - /** * @author Emanuel Graf IFS * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ImplementMethodRefactoring.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ImplementMethodRefactoring.java index a6974d6c53a..7ede8de5c8b 100755 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ImplementMethodRefactoring.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ImplementMethodRefactoring.java @@ -21,17 +21,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.SubMonitor; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; -import org.eclipse.ltk.core.refactoring.RefactoringStatus; -import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; - import org.eclipse.cdt.core.dom.ast.ASTNodeFactoryFactory; import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier; @@ -58,10 +47,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPNodeFactory; import org.eclipse.cdt.core.dom.rewrite.ASTRewrite; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; - import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; import org.eclipse.cdt.internal.ui.refactoring.ModificationCollector; import org.eclipse.cdt.internal.ui.refactoring.utils.Checks; @@ -69,6 +55,17 @@ import org.eclipse.cdt.internal.ui.refactoring.utils.DefinitionFinder; import org.eclipse.cdt.internal.ui.refactoring.utils.NameHelper; import org.eclipse.cdt.internal.ui.refactoring.utils.NodeHelper; import org.eclipse.cdt.internal.ui.refactoring.utils.SelectionHelper; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.SubMonitor; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; +import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; /** * Main class of the ImplementMethodRefactoring (Source generator). diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ImplementMethodRefactoringRunner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ImplementMethodRefactoringRunner.java index 5d2fdb7344b..3055d817b9d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ImplementMethodRefactoringRunner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ImplementMethodRefactoringRunner.java @@ -16,14 +16,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.implementmethod; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.window.IShellProvider; - import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; - import org.eclipse.cdt.internal.ui.refactoring.RefactoringRunner; import org.eclipse.cdt.internal.ui.refactoring.RefactoringSaveHelper; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.window.IShellProvider; /** * @author Lukas Felber diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ImplementMethodWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ImplementMethodWizard.java index a50ebb6eb86..907bb5fee0a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ImplementMethodWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ImplementMethodWizard.java @@ -19,12 +19,11 @@ import java.lang.reflect.InvocationTargetException; import java.util.HashMap; import java.util.Map; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.ltk.ui.refactoring.RefactoringWizard; -import org.eclipse.cdt.ui.CUIPlugin; - /** * @author Mirko Stocker */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/InsertLocation.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/InsertLocation.java index c24e30a7549..71afa47bccc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/InsertLocation.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/InsertLocation.java @@ -15,12 +15,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.implementmethod; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.CoreException; - import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; /** * Is returned when using the find method of the MethodDefinitionInsertLocationFinder. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/MethodDefinitionInsertLocationFinder.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/MethodDefinitionInsertLocationFinder.java index cc9899b0fe6..9b17fae211e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/MethodDefinitionInsertLocationFinder.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/MethodDefinitionInsertLocationFinder.java @@ -22,10 +22,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; - import org.eclipse.cdt.core.dom.ast.IASTDeclaration; import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IASTFunctionDeclarator; @@ -35,11 +31,13 @@ import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateDeclaration; import org.eclipse.cdt.core.model.ITranslationUnit; - import org.eclipse.cdt.internal.ui.editor.SourceHeaderPartnerFinder; import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContext; import org.eclipse.cdt.internal.ui.refactoring.utils.DefinitionFinder; import org.eclipse.cdt.internal.ui.refactoring.utils.NodeHelper; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; /** * Finds the information that are needed to tell where a method definition of a certain diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ParameterHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ParameterHandler.java index d523cb9357a..9d320158df1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ParameterHandler.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ParameterHandler.java @@ -21,7 +21,6 @@ import org.eclipse.cdt.core.dom.ast.IASTParameterDeclaration; import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclSpecifier; import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFunctionDeclarator; - import org.eclipse.cdt.internal.ui.refactoring.utils.NameHelper; import org.eclipse.cdt.internal.ui.refactoring.utils.PseudoNameGenerator; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ParameterInfo.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ParameterInfo.java index 8d02b52520f..a18d34d7f1d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ParameterInfo.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ParameterInfo.java @@ -17,9 +17,7 @@ package org.eclipse.cdt.internal.ui.refactoring.implementmethod; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTParameterDeclaration; - import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTName; - import org.eclipse.cdt.internal.ui.refactoring.utils.NameHelper; /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ParameterNamesInputPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ParameterNamesInputPage.java index bb343522173..5795eb9c6c9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ParameterNamesInputPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ParameterNamesInputPage.java @@ -17,6 +17,12 @@ package org.eclipse.cdt.internal.ui.refactoring.implementmethod; import java.util.HashMap; +import org.eclipse.cdt.internal.ui.preferences.formatter.TranslationUnitPreview; +import org.eclipse.cdt.internal.ui.refactoring.ModificationCollector; +import org.eclipse.cdt.internal.ui.refactoring.changes.CCompositeChange; +import org.eclipse.cdt.internal.ui.refactoring.dialogs.ValidatingLabeledTextField; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.refactoring.CTextFileChange; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -38,14 +44,6 @@ import org.eclipse.text.edits.InsertEdit; import org.eclipse.text.edits.MultiTextEdit; import org.eclipse.text.edits.TextEdit; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.refactoring.CTextFileChange; - -import org.eclipse.cdt.internal.ui.preferences.formatter.TranslationUnitPreview; -import org.eclipse.cdt.internal.ui.refactoring.ModificationCollector; -import org.eclipse.cdt.internal.ui.refactoring.changes.CCompositeChange; -import org.eclipse.cdt.internal.ui.refactoring.dialogs.ValidatingLabeledTextField; - /** * InputPage used by the ImplementMethod refactoring if its necessary to enter additional parameter names. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/BindingClassifier.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/BindingClassifier.java index 9720689ffd6..b8287e83117 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/BindingClassifier.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/BindingClassifier.java @@ -30,8 +30,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import org.eclipse.core.runtime.CoreException; - import org.eclipse.cdt.core.dom.ast.ASTNodeProperty; import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.DOMException; @@ -127,7 +125,6 @@ import org.eclipse.cdt.core.index.IIndexMacro; import org.eclipse.cdt.core.index.IIndexName; import org.eclipse.cdt.core.index.IndexFilter; import org.eclipse.cdt.core.parser.util.CharArrayUtils; - import org.eclipse.cdt.internal.core.dom.parser.ASTNode; import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTIdExpression; @@ -143,6 +140,7 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.Conversions; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.LookupData; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil; +import org.eclipse.core.runtime.CoreException; /** * For a whole translation unit or a part of it determines a set of externally defined bindings that diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/HeaderSubstitutionMap.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/HeaderSubstitutionMap.java index 0791c92a2c5..16b3212078a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/HeaderSubstitutionMap.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/HeaderSubstitutionMap.java @@ -21,14 +21,12 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.eclipse.cdt.internal.corext.codemanipulation.IncludeInfo; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.ui.IMemento; import org.eclipse.ui.WorkbenchException; import org.eclipse.ui.XMLMemento; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.corext.codemanipulation.IncludeInfo; - /** * A set of header file substitution rules. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/HeaderSubstitutor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/HeaderSubstitutor.java index c41904de51e..0e25629db65 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/HeaderSubstitutor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/HeaderSubstitutor.java @@ -20,20 +20,18 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.preferences.IPreferencesService; -import org.eclipse.core.runtime.preferences.IScopeContext; - import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.index.IIndexFile; import org.eclipse.cdt.core.index.IIndexInclude; import org.eclipse.cdt.core.index.IndexLocationFactory; +import org.eclipse.cdt.internal.corext.codemanipulation.IncludeInfo; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.PreferenceConstants; - -import org.eclipse.cdt.internal.corext.codemanipulation.IncludeInfo; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.preferences.IPreferencesService; +import org.eclipse.core.runtime.preferences.IScopeContext; public class HeaderSubstitutor { private static int HEURISTIC_SCORE_NOT_AUTO_EXPORTED_HEADER = 0x1; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeCreationContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeCreationContext.java index 6e5363f6b5f..f49f3a84025 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeCreationContext.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeCreationContext.java @@ -19,10 +19,6 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; - import org.eclipse.cdt.core.dom.ast.IASTPreprocessorIncludeStatement; import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.index.IIndexFile; @@ -30,8 +26,10 @@ import org.eclipse.cdt.core.index.IIndexInclude; import org.eclipse.cdt.core.index.IndexLocationFactory; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.parser.util.ArrayUtil; - import org.eclipse.cdt.internal.corext.codemanipulation.InclusionContext; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.Path; /** * Context for managing include statements. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeCreator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeCreator.java index e1d21d16fe0..fa47476381b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeCreator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeCreator.java @@ -26,17 +26,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.text.edits.InsertEdit; -import org.eclipse.text.edits.MultiTextEdit; - -import com.ibm.icu.text.Collator; - import org.eclipse.cdt.core.dom.IName; import org.eclipse.cdt.core.dom.ast.DOMException; import org.eclipse.cdt.core.dom.ast.IASTDeclaration; @@ -74,11 +63,6 @@ import org.eclipse.cdt.core.index.IIndexName; import org.eclipse.cdt.core.index.IndexFilter; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.parser.Keywords; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.IFunctionSummary; -import org.eclipse.cdt.ui.IRequiredInclude; -import org.eclipse.cdt.ui.text.ICHelpInvocationContext; - import org.eclipse.cdt.internal.core.dom.parser.IASTInternalScope; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPSemantics; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; @@ -90,8 +74,21 @@ import org.eclipse.cdt.internal.core.model.ASTStringUtil; import org.eclipse.cdt.internal.core.util.TextUtil; import org.eclipse.cdt.internal.corext.codemanipulation.IncludeInfo; import org.eclipse.cdt.internal.corext.codemanipulation.StyledInclude; - import org.eclipse.cdt.internal.ui.CHelpProviderManager; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.IFunctionSummary; +import org.eclipse.cdt.ui.IRequiredInclude; +import org.eclipse.cdt.ui.text.ICHelpInvocationContext; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.text.edits.InsertEdit; +import org.eclipse.text.edits.MultiTextEdit; + +import com.ibm.icu.text.Collator; /** * Adds an include statement and, optionally, a 'using' declaration for the currently diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeGroupStyle.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeGroupStyle.java index 9b8474be84b..60d03ec8597 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeGroupStyle.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeGroupStyle.java @@ -21,14 +21,12 @@ import java.util.List; import java.util.Map; import java.util.regex.Pattern; +import org.eclipse.cdt.internal.ui.preferences.PreferencesMessages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.ui.IMemento; import org.eclipse.ui.WorkbenchException; import org.eclipse.ui.XMLMemento; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.preferences.PreferencesMessages; - /** * Style preferences for a category of include statements. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeMap.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeMap.java index 61cc3d52dbf..744754b40b8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeMap.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeMap.java @@ -24,9 +24,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.eclipse.ui.IMemento; - import org.eclipse.cdt.internal.corext.codemanipulation.IncludeInfo; +import org.eclipse.ui.IMemento; /** * A set of header file substitution rules. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java index 024819f71f4..d7a44678cbc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java @@ -26,20 +26,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.eclipse.jface.text.IRegion; -import org.eclipse.text.edits.DeleteEdit; -import org.eclipse.text.edits.InsertEdit; -import org.eclipse.text.edits.MultiTextEdit; -import org.eclipse.text.edits.ReplaceEdit; - -import com.ibm.icu.text.Collator; - import org.eclipse.cdt.core.dom.IName; import org.eclipse.cdt.core.dom.ast.ASTTypeUtil; import org.eclipse.cdt.core.dom.ast.DOMException; @@ -72,9 +58,6 @@ import org.eclipse.cdt.core.index.IIndexInclude; import org.eclipse.cdt.core.index.IIndexName; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.parser.util.ArrayUtil; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.CodeGeneration; - import org.eclipse.cdt.internal.core.dom.rewrite.commenthandler.ASTCommenter; import org.eclipse.cdt.internal.core.dom.rewrite.commenthandler.NodeCommentMap; import org.eclipse.cdt.internal.core.dom.rewrite.util.ASTNodes; @@ -83,6 +66,21 @@ import org.eclipse.cdt.internal.core.util.TextUtil; import org.eclipse.cdt.internal.corext.codemanipulation.IncludeInfo; import org.eclipse.cdt.internal.corext.codemanipulation.StyledInclude; import org.eclipse.cdt.internal.formatter.ChangeFormatter; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.CodeGeneration; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Platform; +import org.eclipse.jface.text.IRegion; +import org.eclipse.text.edits.DeleteEdit; +import org.eclipse.text.edits.InsertEdit; +import org.eclipse.text.edits.MultiTextEdit; +import org.eclipse.text.edits.ReplaceEdit; + +import com.ibm.icu.text.Collator; /** * Organizes the include directives and forward declarations of a source or header file. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludePreferences.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludePreferences.java index 7b8b784621d..015b22025f6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludePreferences.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludePreferences.java @@ -20,14 +20,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.eclipse.jface.preference.IPreferenceStore; - import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.PreferenceConstants; - import org.eclipse.cdt.internal.corext.codemanipulation.StyledInclude; - import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeGroupStyle.IncludeKind; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.jface.preference.IPreferenceStore; /** * Preferences for managing of includes. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeUtil.java index 414652b3306..cc7c87859df 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeUtil.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeUtil.java @@ -19,14 +19,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.content.IContentType; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.Region; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.ast.IASTComment; import org.eclipse.cdt.core.dom.ast.IASTDeclaration; @@ -42,7 +34,6 @@ import org.eclipse.cdt.core.index.IndexLocationFactory; import org.eclipse.cdt.core.parser.Keywords; import org.eclipse.cdt.core.parser.util.CharArrayIntMap; import org.eclipse.cdt.core.parser.util.CharArrayUtils; - import org.eclipse.cdt.internal.core.dom.rewrite.commenthandler.NodeCommentMap; import org.eclipse.cdt.internal.core.dom.rewrite.util.ASTNodes; import org.eclipse.cdt.internal.core.parser.scanner.CharArray; @@ -52,6 +43,13 @@ import org.eclipse.cdt.internal.core.util.TextUtil; import org.eclipse.cdt.internal.corext.codemanipulation.IncludeInfo; import org.eclipse.cdt.internal.corext.codemanipulation.InclusionContext; import org.eclipse.cdt.internal.corext.codemanipulation.StyledInclude; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.content.IContentType; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; public class IncludeUtil { /** Not instantiatable. All methods are static. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/InclusionRequest.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/InclusionRequest.java index c3d631d7155..e0c78657384 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/InclusionRequest.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/InclusionRequest.java @@ -19,14 +19,13 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import org.eclipse.core.runtime.IPath; - import org.eclipse.cdt.core.dom.ast.DOMException; import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IMacroBinding; import org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding; import org.eclipse.cdt.core.index.IIndexFile; import org.eclipse.cdt.core.parser.util.StringUtil; +import org.eclipse.core.runtime.IPath; class InclusionRequest { private static final String UNINITIALIZED = "uninitialized"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/SymbolExportMap.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/SymbolExportMap.java index 007823dc074..18ce3a2594c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/SymbolExportMap.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/SymbolExportMap.java @@ -25,16 +25,14 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import org.eclipse.cdt.internal.corext.codemanipulation.IncludeInfo; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.ui.IMemento; import org.eclipse.ui.WorkbenchException; import org.eclipse.ui.XMLMemento; import com.ibm.icu.text.Collator; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.corext.codemanipulation.IncludeInfo; - /** * A set of header file substitution rules. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTManager.java index 260379f4eca..6f04baa0b55 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTManager.java @@ -25,18 +25,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.Assert; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.Path; -import org.eclipse.ltk.core.refactoring.RefactoringStatus; -import org.eclipse.ltk.core.refactoring.RefactoringStatusEntry; -import org.eclipse.osgi.util.NLS; -import org.eclipse.ui.services.IDisposable; - import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.DOMException; import org.eclipse.cdt.core.dom.ast.EScopeKind; @@ -103,15 +91,24 @@ import org.eclipse.cdt.core.index.IIndexName; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.core.dom.parser.ASTInternal; import org.eclipse.cdt.internal.core.dom.parser.c.CVisitor; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; import org.eclipse.cdt.internal.core.index.IIndexScope; import org.eclipse.cdt.internal.corext.util.CModelUtil; - import org.eclipse.cdt.internal.ui.editor.ASTProvider; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.Assert; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.core.runtime.Path; +import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import org.eclipse.ltk.core.refactoring.RefactoringStatusEntry; +import org.eclipse.osgi.util.NLS; +import org.eclipse.ui.services.IDisposable; /** * Used for refactoring to cache the IASTTranslationUnits. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactoringArgument.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactoringArgument.java index bccd37055fc..b7a1ae135f5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactoringArgument.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactoringArgument.java @@ -14,8 +14,6 @@ ******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.rename; -import org.eclipse.core.resources.IFile; - import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.ast.IBinding; @@ -35,9 +33,9 @@ import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ISourceRange; import org.eclipse.cdt.core.model.ISourceReference; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.core.dom.parser.cpp.ClassTypeHelper; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.resources.IFile; /** * Represents the input to a refactoring. Important are file and offset, the rest diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactory.java index b4bb89e5765..09b4cfd03f7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactory.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactory.java @@ -18,6 +18,9 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Iterator; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.IWorkingCopy; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; @@ -27,10 +30,6 @@ import org.eclipse.jface.text.ITextSelection; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.ide.IDE; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.IWorkingCopy; - /** * Serves to launch the various refactorings. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameClassProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameClassProcessor.java index fdf42246eb1..70eacf8e40e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameClassProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameClassProcessor.java @@ -19,20 +19,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.Path; -import org.eclipse.ltk.core.refactoring.Change; -import org.eclipse.ltk.core.refactoring.CompositeChange; -import org.eclipse.ltk.core.refactoring.RefactoringStatus; -import org.eclipse.ltk.core.refactoring.participants.RenameArguments; - import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IScope; import org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding; @@ -46,12 +32,24 @@ import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.parser.util.ArrayUtil; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; - import org.eclipse.cdt.internal.ui.refactoring.changes.CCompositeChange; import org.eclipse.cdt.internal.ui.refactoring.changes.RenameTranslationUnitChange; import org.eclipse.cdt.internal.ui.util.NameComposer; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.core.runtime.Path; +import org.eclipse.ltk.core.refactoring.Change; +import org.eclipse.ltk.core.refactoring.CompositeChange; +import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import org.eclipse.ltk.core.refactoring.participants.RenameArguments; /** * Processor adding constructor and destructor to the bindings to be renamed. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameLocalProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameLocalProcessor.java index ad305b6e4da..282ede61cd0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameLocalProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameLocalProcessor.java @@ -17,18 +17,15 @@ package org.eclipse.cdt.internal.ui.refactoring.rename; import java.util.Collection; import java.util.Iterator; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.ltk.core.refactoring.RefactoringStatus; - import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IParameter; import org.eclipse.cdt.core.dom.ast.IScope; - import org.eclipse.cdt.internal.core.dom.parser.ASTInternal; - import org.eclipse.cdt.internal.ui.refactoring.RefactoringSaveHelper; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.ltk.core.refactoring.RefactoringStatus; /** * Rename processor, setting up input page for a local rename. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameMacroProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameMacroProcessor.java index fde11b53c04..67ba83d7745 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameMacroProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameMacroProcessor.java @@ -16,11 +16,10 @@ package org.eclipse.cdt.internal.ui.refactoring.rename; import java.util.Collection; +import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.ltk.core.refactoring.RefactoringStatus; -import org.eclipse.cdt.core.dom.ast.IBinding; - /** * Rename processor that sets up the input page for renaming a global entity. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameMethodProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameMethodProcessor.java index add457f9fab..5c5972d77e8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameMethodProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameMethodProcessor.java @@ -17,12 +17,6 @@ package org.eclipse.cdt.internal.ui.refactoring.rename; import java.util.ArrayList; import java.util.Arrays; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.ltk.core.refactoring.RefactoringStatus; -import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; - import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTNode; @@ -30,10 +24,14 @@ import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IScope; import org.eclipse.cdt.core.dom.ast.cpp.ICPPConstructor; import org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod; - import org.eclipse.cdt.internal.core.dom.parser.ASTInternal; import org.eclipse.cdt.internal.core.dom.parser.cpp.ClassTypeHelper; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPSemantics; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; /** * Rename processor for methods. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessor.java index aa91dbbad0d..5f5efcc7519 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessor.java @@ -14,6 +14,20 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.rename; +import org.eclipse.cdt.core.CCProjectNature; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.CProjectNature; +import org.eclipse.cdt.core.dom.ast.DOMException; +import org.eclipse.cdt.core.dom.ast.IBinding; +import org.eclipse.cdt.core.dom.ast.IScope; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPConstructor; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPMember; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.index.IIndexManager; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; @@ -30,21 +44,6 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.ui.IWorkingSetManager; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.core.CCProjectNature; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.CProjectNature; -import org.eclipse.cdt.core.dom.ast.DOMException; -import org.eclipse.cdt.core.dom.ast.IBinding; -import org.eclipse.cdt.core.dom.ast.IScope; -import org.eclipse.cdt.core.dom.ast.cpp.ICPPConstructor; -import org.eclipse.cdt.core.dom.ast.cpp.ICPPMember; -import org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod; -import org.eclipse.cdt.core.index.IIndex; -import org.eclipse.cdt.core.index.IIndexManager; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.CUIPlugin; - /** * This is the processor used for the rename. It decides which of the delegates to * use and forwards further calls to the delegate. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessorDelegate.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessorDelegate.java index d5f33ffe64a..998d1a01f05 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessorDelegate.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessorDelegate.java @@ -23,6 +23,11 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; +import org.eclipse.cdt.core.dom.ast.IBinding; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.index.IIndexFileLocation; +import org.eclipse.cdt.core.index.IIndexName; +import org.eclipse.cdt.ui.refactoring.CTextFileChange; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspaceRoot; @@ -47,12 +52,6 @@ import org.eclipse.text.edits.MultiTextEdit; import org.eclipse.text.edits.ReplaceEdit; import org.eclipse.text.edits.TextEditGroup; -import org.eclipse.cdt.core.dom.ast.IBinding; -import org.eclipse.cdt.core.index.IIndex; -import org.eclipse.cdt.core.index.IIndexFileLocation; -import org.eclipse.cdt.core.index.IIndexName; -import org.eclipse.cdt.ui.refactoring.CTextFileChange; - /** * Abstract base for all different rename processors used by the top processor. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameRefactoringInputPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameRefactoringInputPage.java index 3ab8908dd2d..e9f3d97a1c5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameRefactoringInputPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameRefactoringInputPage.java @@ -15,6 +15,7 @@ ******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.rename; +import org.eclipse.cdt.core.CConventions; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.window.Window; import org.eclipse.ltk.ui.refactoring.UserInputWizardPage; @@ -36,8 +37,6 @@ import org.eclipse.ui.IWorkingSetManager; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.IWorkingSetSelectionDialog; -import org.eclipse.cdt.core.CConventions; - /** * Input page added to the standard refactoring wizard. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameRefactoringPreferences.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameRefactoringPreferences.java index d9baace0333..69c3555b22a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameRefactoringPreferences.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameRefactoringPreferences.java @@ -13,9 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.rename; -import org.eclipse.jface.dialogs.IDialogSettings; - import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.jface.dialogs.IDialogSettings; public class CRenameRefactoringPreferences { private static final String DIALOG_SETTINGS_KEY = "CRenameRefactoringInputPage"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CResourceRenameRefactoringInputPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CResourceRenameRefactoringInputPage.java index 6355ee099eb..b1e5e2a0be5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CResourceRenameRefactoringInputPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CResourceRenameRefactoringInputPage.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.rename; +import org.eclipse.cdt.internal.ui.preferences.OrganizeIncludesPreferencePage; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IResource; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogSettings; @@ -35,10 +37,6 @@ import org.eclipse.swt.widgets.Link; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.dialogs.PreferencesUtil; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.preferences.OrganizeIncludesPreferencePage; - public class CResourceRenameRefactoringInputPage extends UserInputWizardPage { /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/HeaderFileReferenceAdjuster.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/HeaderFileReferenceAdjuster.java index 7b8d3ccc015..01e7c58cd9b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/HeaderFileReferenceAdjuster.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/HeaderFileReferenceAdjuster.java @@ -26,34 +26,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.SubMonitor; -import org.eclipse.core.runtime.preferences.IPreferencesService; -import org.eclipse.core.runtime.preferences.IScopeContext; -import org.eclipse.jface.text.IRegion; -import org.eclipse.ltk.core.refactoring.Change; -import org.eclipse.ltk.core.refactoring.CompositeChange; -import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; -import org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor; -import org.eclipse.ltk.core.refactoring.participants.ValidateEditChecker; -import org.eclipse.text.edits.DeleteEdit; -import org.eclipse.text.edits.InsertEdit; -import org.eclipse.text.edits.MultiTextEdit; -import org.eclipse.text.edits.ReplaceEdit; -import org.eclipse.text.edits.TextEdit; -import org.eclipse.text.edits.TextEditGroup; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.ast.IASTComment; import org.eclipse.cdt.core.dom.ast.IASTName; @@ -73,12 +45,6 @@ import org.eclipse.cdt.core.model.ISourceRoot; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.model.IWorkingCopy; import org.eclipse.cdt.core.settings.model.ICSourceEntry; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.IWorkingCopyManager; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.refactoring.CTextFileChange; -import org.eclipse.cdt.utils.PathUtil; - import org.eclipse.cdt.internal.core.dom.rewrite.commenthandler.ASTCommenter; import org.eclipse.cdt.internal.core.dom.rewrite.commenthandler.NodeCommentMap; import org.eclipse.cdt.internal.core.dom.rewrite.util.ASTNodes; @@ -87,11 +53,42 @@ import org.eclipse.cdt.internal.core.util.TextUtil; import org.eclipse.cdt.internal.corext.codemanipulation.IncludeInfo; import org.eclipse.cdt.internal.corext.codemanipulation.StubUtility; import org.eclipse.cdt.internal.corext.codemanipulation.StyledInclude; - import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeCreationContext; import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeGroupStyle; import org.eclipse.cdt.internal.ui.refactoring.includes.IncludePreferences; import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeUtil; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.IWorkingCopyManager; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.refactoring.CTextFileChange; +import org.eclipse.cdt.utils.PathUtil; +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IWorkspaceRoot; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.SubMonitor; +import org.eclipse.core.runtime.preferences.IPreferencesService; +import org.eclipse.core.runtime.preferences.IScopeContext; +import org.eclipse.jface.text.IRegion; +import org.eclipse.ltk.core.refactoring.Change; +import org.eclipse.ltk.core.refactoring.CompositeChange; +import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; +import org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor; +import org.eclipse.ltk.core.refactoring.participants.ValidateEditChecker; +import org.eclipse.text.edits.DeleteEdit; +import org.eclipse.text.edits.InsertEdit; +import org.eclipse.text.edits.MultiTextEdit; +import org.eclipse.text.edits.ReplaceEdit; +import org.eclipse.text.edits.TextEdit; +import org.eclipse.text.edits.TextEditGroup; /** * Updates include statements and include guards in response to file or folder move or rename. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameCSourceFolderChange.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameCSourceFolderChange.java index 507858abdaf..70eb2333dfe 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameCSourceFolderChange.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameCSourceFolderChange.java @@ -18,6 +18,13 @@ package org.eclipse.cdt.internal.ui.refactoring.rename; import java.util.HashSet; import java.util.Set; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.settings.model.CSourceEntry; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.core.settings.model.ICSourceEntry; +import org.eclipse.cdt.core.settings.model.WriteAccessException; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; @@ -31,14 +38,6 @@ import org.eclipse.ltk.core.refactoring.Change; import org.eclipse.ltk.core.refactoring.RefactoringStatus; import org.eclipse.osgi.util.NLS; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.settings.model.CSourceEntry; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.core.settings.model.ICSourceEntry; -import org.eclipse.cdt.core.settings.model.WriteAccessException; -import org.eclipse.cdt.ui.CUIPlugin; - /** * @author Emanuel Graf IFS */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameInformationPopup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameInformationPopup.java index c54782be08d..c44b8adef50 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameInformationPopup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameInformationPopup.java @@ -14,6 +14,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.rename; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds; +import org.eclipse.cdt.internal.ui.preferences.CPluginPreferencePage; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -82,13 +87,6 @@ import org.eclipse.ui.dialogs.PreferencesUtil; import org.eclipse.ui.keys.IBindingService; import org.eclipse.ui.progress.UIJob; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds; -import org.eclipse.cdt.internal.ui.preferences.CPluginPreferencePage; - public class RenameInformationPopup implements IWidgetTokenKeeper, IWidgetTokenKeeperExtension { private class PopupVisibilityManager diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameLinkedMode.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameLinkedMode.java index ab1f7ddc0a3..8245694ce7c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameLinkedMode.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameLinkedMode.java @@ -18,6 +18,24 @@ import java.lang.reflect.InvocationTargetException; import java.util.Arrays; import java.util.Comparator; +import org.eclipse.cdt.core.CConventions; +import org.eclipse.cdt.core.dom.ast.IASTName; +import org.eclipse.cdt.core.dom.ast.IASTNodeSelector; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.dom.ast.gnu.cpp.GPPLanguage; +import org.eclipse.cdt.core.dom.parser.AbstractCLikeLanguage; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; +import org.eclipse.cdt.internal.ui.editor.ASTProvider; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.editor.EditorHighlightingSynchronizer; +import org.eclipse.cdt.internal.ui.search.LinkedNamesFinder; +import org.eclipse.cdt.internal.ui.text.correction.proposals.LinkedNamesAssistProposal.DeleteBlockingExitPolicy; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.IWorkingCopyManager; import org.eclipse.core.commands.operations.IOperationHistory; import org.eclipse.core.commands.operations.IUndoContext; import org.eclipse.core.commands.operations.IUndoableOperation; @@ -62,27 +80,6 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.texteditor.link.EditorLinkedModeUI; -import org.eclipse.cdt.core.CConventions; -import org.eclipse.cdt.core.dom.ast.IASTName; -import org.eclipse.cdt.core.dom.ast.IASTNodeSelector; -import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.ast.gnu.cpp.GPPLanguage; -import org.eclipse.cdt.core.dom.parser.AbstractCLikeLanguage; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.IWorkingCopyManager; - -import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; - -import org.eclipse.cdt.internal.ui.editor.ASTProvider; -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.editor.EditorHighlightingSynchronizer; -import org.eclipse.cdt.internal.ui.search.LinkedNamesFinder; -import org.eclipse.cdt.internal.ui.text.correction.proposals.LinkedNamesAssistProposal.DeleteBlockingExitPolicy; - public class RenameLinkedMode { private class FocusEditingSupport implements IEditingSupport { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameModifications.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameModifications.java index 117aeac7c30..a72368d9055 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameModifications.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameModifications.java @@ -18,6 +18,12 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.eclipse.cdt.core.dom.ast.IBinding; +import org.eclipse.cdt.core.model.ISourceRoot; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.parser.util.ArrayUtil; +import org.eclipse.cdt.internal.corext.refactoring.participants.ResourceModifications; +import org.eclipse.cdt.internal.ui.refactoring.reorg.RefactoringModifications; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.mapping.IResourceChangeDescriptionFactory; @@ -32,15 +38,6 @@ import org.eclipse.ltk.core.refactoring.participants.RenameArguments; import org.eclipse.ltk.core.refactoring.participants.SharableParticipants; import org.eclipse.ltk.core.refactoring.participants.ValidateEditChecker; -import org.eclipse.cdt.core.dom.ast.IBinding; -import org.eclipse.cdt.core.model.ISourceRoot; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.parser.util.ArrayUtil; - -import org.eclipse.cdt.internal.corext.refactoring.participants.ResourceModifications; - -import org.eclipse.cdt.internal.ui.refactoring.reorg.RefactoringModifications; - /** * Stores objects renamed by the rename refactoring. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameSupport.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameSupport.java index 24e621945a6..9d2d455cf18 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameSupport.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameSupport.java @@ -16,6 +16,11 @@ package org.eclipse.cdt.internal.ui.refactoring.rename; import java.lang.reflect.InvocationTargetException; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.internal.ui.refactoring.RefactoringExecutionHelper; +import org.eclipse.cdt.internal.ui.refactoring.RefactoringSaveHelper; +import org.eclipse.cdt.internal.ui.refactoring.RefactoringStarter; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; @@ -31,13 +36,6 @@ import org.eclipse.ltk.core.refactoring.RefactoringStatus; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.refactoring.RefactoringExecutionHelper; -import org.eclipse.cdt.internal.ui.refactoring.RefactoringSaveHelper; -import org.eclipse.cdt.internal.ui.refactoring.RefactoringStarter; - /** * Central access point to execute rename refactorings. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/TextSearchWrapper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/TextSearchWrapper.java index 940a26df8e7..ab0f46e8e28 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/TextSearchWrapper.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/TextSearchWrapper.java @@ -30,6 +30,12 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.formatter.scanner.SimpleScanner; +import org.eclipse.cdt.internal.formatter.scanner.Token; +import org.eclipse.cdt.utils.PathUtil; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -47,14 +53,6 @@ import org.eclipse.search.core.text.TextSearchScope; import org.eclipse.ui.IWorkingSet; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.utils.PathUtil; - -import org.eclipse.cdt.internal.formatter.scanner.SimpleScanner; -import org.eclipse.cdt.internal.formatter.scanner.Token; - /** * Wraps the platform text search and uses a scanner to categorize the text-matches * by location (comments, string-literals, etc.). diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/reorg/RefactoringModifications.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/reorg/RefactoringModifications.java index c6b1894c247..cb7bb1dc811 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/reorg/RefactoringModifications.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/reorg/RefactoringModifications.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.reorg; +import org.eclipse.cdt.internal.corext.refactoring.participants.ResourceModifications; import org.eclipse.core.resources.mapping.IResourceChangeDescriptionFactory; import org.eclipse.ltk.core.refactoring.RefactoringStatus; import org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant; @@ -21,8 +22,6 @@ import org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor; import org.eclipse.ltk.core.refactoring.participants.SharableParticipants; import org.eclipse.ltk.core.refactoring.participants.ValidateEditChecker; -import org.eclipse.cdt.internal.corext.refactoring.participants.ResourceModifications; - public abstract class RefactoringModifications { private ResourceModifications fResourceModifications; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/DeclaratorFinder.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/DeclaratorFinder.java index 80df507c6c6..2230fd1c697 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/DeclaratorFinder.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/DeclaratorFinder.java @@ -15,8 +15,6 @@ ******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.togglefunction; -import org.eclipse.jface.text.ITextSelection; - import org.eclipse.cdt.core.dom.ast.IASTDeclarator; import org.eclipse.cdt.core.dom.ast.IASTFunctionDeclarator; import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition; @@ -28,8 +26,8 @@ import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration; import org.eclipse.cdt.core.dom.ast.IASTStatement; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateDeclaration; - import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; +import org.eclipse.jface.text.ITextSelection; /** * Given a selection and a translation unit, this class finds a diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/IToggleRefactoringStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/IToggleRefactoringStrategy.java index b820a10cbc7..38df1b078c5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/IToggleRefactoringStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/IToggleRefactoringStrategy.java @@ -15,9 +15,8 @@ ******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.togglefunction; -import org.eclipse.core.runtime.CoreException; - import org.eclipse.cdt.internal.ui.refactoring.ModificationCollector; +import org.eclipse.core.runtime.CoreException; public interface IToggleRefactoringStrategy { public void run(ModificationCollector modifications) throws CoreException; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/InsertionPointFinder.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/InsertionPointFinder.java index 5d1c2000d7f..0ad5f210d74 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/InsertionPointFinder.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/InsertionPointFinder.java @@ -27,10 +27,8 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFunctionDeclarator; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFunctionDefinition; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateDeclaration; - import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTCompositeTypeSpecifier; - import org.eclipse.cdt.internal.ui.refactoring.Container; public class InsertionPointFinder { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/RefactoringJob.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/RefactoringJob.java index 1d7bcadb584..e5d2652db50 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/RefactoringJob.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/RefactoringJob.java @@ -15,6 +15,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.togglefunction; +import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContext; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -27,10 +29,6 @@ import org.eclipse.ltk.core.refactoring.NullChange; import org.eclipse.ltk.core.refactoring.RefactoringCore; import org.eclipse.ltk.core.refactoring.RefactoringStatus; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContext; - class RefactoringJob extends Job { public final static Object FAMILY_TOGGLE_DEFINITION = new Object(); private final ToggleRefactoring refactoring; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleFileCreator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleFileCreator.java index 9cea37bbd8e..a3ecc67ccb8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleFileCreator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleFileCreator.java @@ -15,6 +15,8 @@ ******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.togglefunction; +import org.eclipse.cdt.internal.ui.refactoring.changes.CreateFileChange; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; @@ -25,10 +27,6 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.refactoring.changes.CreateFileChange; - public class ToggleFileCreator { private static final String EMPTY_STRING = ""; //$NON-NLS-1$ private final ToggleRefactoringContext context; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleFromClassToInHeaderStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleFromClassToInHeaderStrategy.java index f43168104e7..3c69117c234 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleFromClassToInHeaderStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleFromClassToInHeaderStrategy.java @@ -14,8 +14,6 @@ ******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.togglefunction; -import org.eclipse.text.edits.TextEditGroup; - import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier; import org.eclipse.cdt.core.dom.ast.IASTFunctionDeclarator; import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition; @@ -30,10 +28,9 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFunctionWithTryBlock; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNamespaceDefinition; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateDeclaration; import org.eclipse.cdt.core.dom.rewrite.ASTRewrite; - import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; - import org.eclipse.cdt.internal.ui.refactoring.ModificationCollector; +import org.eclipse.text.edits.TextEditGroup; public class ToggleFromClassToInHeaderStrategy implements IToggleRefactoringStrategy { protected TextEditGroup infoText = new TextEditGroup(Messages.EditGroupName); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleFromImplementationToHeaderOrClassStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleFromImplementationToHeaderOrClassStrategy.java index 354fa091336..9ffbfb96ae9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleFromImplementationToHeaderOrClassStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleFromImplementationToHeaderOrClassStrategy.java @@ -19,10 +19,6 @@ package org.eclipse.cdt.internal.ui.refactoring.togglefunction; import java.util.Collections; import java.util.List; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.text.edits.TextEditGroup; - import org.eclipse.cdt.core.dom.ast.IASTComment; import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition; import org.eclipse.cdt.core.dom.ast.IASTNode; @@ -35,12 +31,13 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNamespaceDefinition; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTQualifiedName; import org.eclipse.cdt.core.dom.rewrite.ASTRewrite; import org.eclipse.cdt.core.dom.rewrite.ASTRewrite.CommentPosition; - import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; import org.eclipse.cdt.internal.core.dom.rewrite.ASTLiteralNode; - import org.eclipse.cdt.internal.ui.refactoring.ModificationCollector; import org.eclipse.cdt.internal.ui.refactoring.utils.CPPASTAllVisitor; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.text.edits.TextEditGroup; public class ToggleFromImplementationToHeaderOrClassStrategy implements IToggleRefactoringStrategy { private ToggleRefactoringContext context; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleFromInHeaderToClassStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleFromInHeaderToClassStrategy.java index 3f726fb4f72..c07a8e827b8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleFromInHeaderToClassStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleFromInHeaderToClassStrategy.java @@ -16,8 +16,6 @@ package org.eclipse.cdt.internal.ui.refactoring.togglefunction; import java.util.List; -import org.eclipse.text.edits.TextEditGroup; - import org.eclipse.cdt.core.dom.ast.IASTComment; import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; import org.eclipse.cdt.core.dom.ast.IASTFunctionDeclarator; @@ -32,11 +30,10 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTQualifiedName; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateDeclaration; import org.eclipse.cdt.core.dom.rewrite.ASTRewrite; import org.eclipse.cdt.core.dom.rewrite.ASTRewrite.CommentPosition; - import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTSimpleDeclaration; - import org.eclipse.cdt.internal.ui.refactoring.ModificationCollector; +import org.eclipse.text.edits.TextEditGroup; public class ToggleFromInHeaderToClassStrategy implements IToggleRefactoringStrategy { private TextEditGroup infoText; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleFromInHeaderToImplementationStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleFromInHeaderToImplementationStrategy.java index 66acd6e32a2..28314bd929a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleFromInHeaderToImplementationStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleFromInHeaderToImplementationStrategy.java @@ -20,11 +20,6 @@ package org.eclipse.cdt.internal.ui.refactoring.togglefunction; import java.util.ArrayList; import java.util.List; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.text.edits.TextEditGroup; - import org.eclipse.cdt.core.CCProjectNature; import org.eclipse.cdt.core.dom.ast.ASTNodeFactoryFactory; import org.eclipse.cdt.core.dom.ast.ASTVisitor; @@ -62,12 +57,14 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateParameter; import org.eclipse.cdt.core.dom.ast.cpp.ICPPNodeFactory; import org.eclipse.cdt.core.dom.rewrite.ASTRewrite; import org.eclipse.cdt.core.dom.rewrite.ASTRewrite.CommentPosition; - import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTNamespaceDefinition; import org.eclipse.cdt.internal.core.dom.rewrite.ASTLiteralNode; - import org.eclipse.cdt.internal.ui.refactoring.Container; import org.eclipse.cdt.internal.ui.refactoring.ModificationCollector; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.text.edits.TextEditGroup; public class ToggleFromInHeaderToImplementationStrategy implements IToggleRefactoringStrategy { private class NamespaceFinderVisitor extends ASTVisitor { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleNodeHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleNodeHelper.java index d19c2fd92e0..4217cebe4f2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleNodeHelper.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleNodeHelper.java @@ -63,14 +63,12 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateInstance; import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameter; import org.eclipse.cdt.core.dom.rewrite.ASTRewrite; import org.eclipse.cdt.core.dom.rewrite.ASTRewrite.CommentPosition; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil; import org.eclipse.cdt.internal.core.dom.rewrite.DeclarationGeneratorImpl; - import org.eclipse.cdt.internal.ui.refactoring.ModificationCollector; import org.eclipse.cdt.internal.ui.refactoring.utils.NodeHelper; +import org.eclipse.cdt.ui.CUIPlugin; public class ToggleNodeHelper extends NodeHelper { private static final String EMPTY_STRING = ""; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleRefactoring.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleRefactoring.java index a9d990fb671..9da3bfd2f8d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleRefactoring.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleRefactoring.java @@ -16,21 +16,19 @@ ******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.togglefunction; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; -import org.eclipse.ltk.core.refactoring.RefactoringStatus; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.index.IIndexManager; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; - import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; import org.eclipse.cdt.internal.ui.refactoring.ModificationCollector; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.ltk.core.refactoring.RefactoringDescriptor; +import org.eclipse.ltk.core.refactoring.RefactoringStatus; /** * Determines whether a valid function was selected by the user to be able to diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleRefactoringContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleRefactoringContext.java index 319ece180b4..6e8cf263813 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleRefactoringContext.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleRefactoringContext.java @@ -15,12 +15,6 @@ ******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.togglefunction; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.jface.text.ITextSelection; - import org.eclipse.cdt.core.dom.ast.IASTFunctionDeclarator; import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition; import org.eclipse.cdt.core.dom.ast.IASTName; @@ -33,14 +27,17 @@ import org.eclipse.cdt.core.index.IIndexName; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CoreModelUtil; import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; import org.eclipse.cdt.internal.corext.util.CModelUtil; - import org.eclipse.cdt.internal.ui.editor.SourceHeaderPartnerFinder; import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContext; import org.eclipse.cdt.internal.ui.refactoring.IndexToASTNameHelper; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.jface.text.ITextSelection; public class ToggleRefactoringContext { private IASTFunctionDefinition targetDefinition; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleRefactoringRunner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleRefactoringRunner.java index afe21932c8a..de592d80532 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleRefactoringRunner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleRefactoringRunner.java @@ -15,16 +15,14 @@ ******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.togglefunction; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.window.IShellProvider; - import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.ui.refactoring.RefactoringRunner; import org.eclipse.cdt.internal.ui.refactoring.RefactoringSaveHelper; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.jface.window.IShellProvider; /** * Responsible for scheduling a job which runs the ToggleRefactoring. Differs diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleStrategyFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleStrategyFactory.java index 741f69c9f8d..2c84bcfbb95 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleStrategyFactory.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/ToggleStrategyFactory.java @@ -16,7 +16,6 @@ package org.eclipse.cdt.internal.ui.refactoring.togglefunction; import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateDeclaration; - import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; public class ToggleStrategyFactory { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/TogglingActionDelegate.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/TogglingActionDelegate.java index 9e5caffaec2..439f0c82b12 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/TogglingActionDelegate.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/TogglingActionDelegate.java @@ -15,6 +15,8 @@ ******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.togglefunction; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.action.IAction; import org.eclipse.jface.text.TextSelection; import org.eclipse.jface.viewers.ISelection; @@ -23,9 +25,6 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindowActionDelegate; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; - /** * Represents the interface between the user who invokes the action and the * actual refactoring mechanism. Starts the ToggleRefactoringRunner. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/ASTHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/ASTHelper.java index 2d3faf70c11..e2f8aee9d61 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/ASTHelper.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/ASTHelper.java @@ -36,7 +36,6 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTParameterDeclaration; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUsingDeclaration; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUsingDirective; - import org.eclipse.cdt.internal.ui.refactoring.extractfunction.TrailNodeEqualityChecker; public class ASTHelper { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/Checks.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/Checks.java index 70a9ff84e5a..014aa182eec 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/Checks.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/Checks.java @@ -14,6 +14,15 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.utils; +import org.eclipse.cdt.core.CConventions; +import org.eclipse.cdt.core.dom.ast.gnu.cpp.GPPLanguage; +import org.eclipse.cdt.core.dom.parser.AbstractCLikeLanguage; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.corext.util.CModelUtil; +import org.eclipse.cdt.internal.corext.util.Resources; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; @@ -29,17 +38,6 @@ import org.eclipse.ltk.core.refactoring.RefactoringStatus; import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; import org.eclipse.ltk.core.refactoring.participants.ResourceChangeChecker; -import org.eclipse.cdt.core.CConventions; -import org.eclipse.cdt.core.dom.ast.gnu.cpp.GPPLanguage; -import org.eclipse.cdt.core.dom.parser.AbstractCLikeLanguage; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.ITranslationUnit; - -import org.eclipse.cdt.internal.corext.util.CModelUtil; -import org.eclipse.cdt.internal.corext.util.Resources; - /** * This class defines a set of reusable static checks methods. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/DefinitionFinder.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/DefinitionFinder.java index 5f68ea039f6..ce34bf04972 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/DefinitionFinder.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/DefinitionFinder.java @@ -18,13 +18,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.SubMonitor; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorPart; - import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; import org.eclipse.cdt.core.dom.ast.IASTDeclaration; import org.eclipse.cdt.core.dom.ast.IASTDeclarator; @@ -39,12 +32,16 @@ import org.eclipse.cdt.core.index.IIndexName; import org.eclipse.cdt.core.model.CoreModelUtil; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.parser.util.ArrayUtil; - import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; - import org.eclipse.cdt.internal.ui.editor.ITranslationUnitEditorInput; import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContext; import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.core.runtime.SubMonitor; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; /** * Helper class for finding definitions and class member declarations diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/EclipseObjects.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/EclipseObjects.java index 75c61dbe3b6..6c18ce60dca 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/EclipseObjects.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/EclipseObjects.java @@ -14,6 +14,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.utils; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; @@ -33,10 +35,6 @@ import org.eclipse.ui.editors.text.TextEditor; import org.eclipse.ui.texteditor.IDocumentProvider; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.core.model.ICElement; - -import org.eclipse.cdt.internal.ui.editor.CEditor; - /** * A collection of helper methods to interact with the workbench's IDocuments and IFiles */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/ExpressionFinder.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/ExpressionFinder.java index f9981aee3c7..8cd31c1adbe 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/ExpressionFinder.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/ExpressionFinder.java @@ -14,15 +14,13 @@ ******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.utils; -import org.eclipse.core.runtime.Path; - import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTNodeLocation; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.index.IIndexName; - import org.eclipse.cdt.internal.ui.refactoring.Container; +import org.eclipse.core.runtime.Path; /** * @author Guido Zgraggen IFS diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/FileContentHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/FileContentHelper.java index 21f4e262f03..571b269a9a0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/FileContentHelper.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/FileContentHelper.java @@ -19,11 +19,10 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; -import org.eclipse.cdt.ui.CUIPlugin; - /** * Some helper methods to access part of the content of an iFile * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/FileHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/FileHelper.java index c0db9b997a6..87051bc9f7d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/FileHelper.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/FileHelper.java @@ -14,13 +14,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.utils; +import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; -import org.eclipse.cdt.core.dom.ast.IASTNode; - /** * Helper class concerning files. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/IdentifierHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/IdentifierHelper.java index c5b565639ee..5b69b057c07 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/IdentifierHelper.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/IdentifierHelper.java @@ -19,12 +19,10 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.eclipse.osgi.util.NLS; - import org.eclipse.cdt.core.parser.KeywordSetKey; import org.eclipse.cdt.core.parser.ParserLanguage; - import org.eclipse.cdt.internal.core.parser.token.KeywordSets; +import org.eclipse.osgi.util.NLS; /** * Class to verify that an identifier meets the C++ rules for valid names. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NameHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NameHelper.java index f1b0d47a152..88214fe273e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NameHelper.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NameHelper.java @@ -17,8 +17,6 @@ package org.eclipse.cdt.internal.ui.refactoring.utils; import java.util.Arrays; import java.util.regex.Pattern; -import org.eclipse.core.runtime.CoreException; - import org.eclipse.cdt.core.dom.ast.ASTTypeUtil; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTNode.CopyStyle; @@ -31,10 +29,9 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTQualifiedName; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.parser.Keywords; import org.eclipse.cdt.core.parser.util.CharArrayIntMap; - import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTQualifiedName; - import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContext; +import org.eclipse.core.runtime.CoreException; /** * Helps with IASTNames. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NamespaceHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NamespaceHelper.java index 31ab480bfef..a86d81ae772 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NamespaceHelper.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NamespaceHelper.java @@ -17,9 +17,6 @@ package org.eclipse.cdt.internal.ui.refactoring.utils; import java.util.ArrayList; import java.util.List; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; - import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier; import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IASTName; @@ -32,13 +29,13 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNamespaceDefinition; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateDeclaration; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateParameter; import org.eclipse.cdt.core.model.ITranslationUnit; - import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTNamedTypeSpecifier; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTSimpleTypeTemplateParameter; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTTemplateId; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTTypeId; - import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContext; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; /** * Helper class to find Namespace informations. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NodeHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NodeHelper.java index 1de29632ebc..ea6968654b1 100755 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NodeHelper.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NodeHelper.java @@ -15,10 +15,6 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.utils; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.Path; - import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier; import org.eclipse.cdt.core.dom.ast.IASTDeclaration; import org.eclipse.cdt.core.dom.ast.IASTDeclarator; @@ -35,14 +31,15 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFunctionDeclarator; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTQualifiedName; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateDeclaration; import org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod; - import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTNamespaceDefinition; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTTranslationUnit; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; - import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContext; import org.eclipse.cdt.internal.ui.refactoring.MethodContext; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.Path; /** * General class for common Node operations. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/SelectionHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/SelectionHelper.java index 616c4f171fd..39bcb0bf4cb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/SelectionHelper.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/SelectionHelper.java @@ -16,11 +16,6 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.utils; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.text.Region; -import org.eclipse.jface.viewers.ISelection; - import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTDeclaration; import org.eclipse.cdt.core.dom.ast.IASTFileLocation; @@ -29,8 +24,11 @@ import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTNodeLocation; import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; - import org.eclipse.cdt.internal.ui.refactoring.Container; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.jface.text.Region; +import org.eclipse.jface.viewers.ISelection; /** * Helper class to support operations concerning a selection. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/resources/ResourceExclusionContributor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/resources/ResourceExclusionContributor.java index c0500edff00..62381c86297 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/resources/ResourceExclusionContributor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/resources/ResourceExclusionContributor.java @@ -20,6 +20,12 @@ import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; +import org.eclipse.cdt.core.resources.ExclusionInstance; +import org.eclipse.cdt.core.resources.ExclusionType; +import org.eclipse.cdt.core.resources.RefreshExclusion; +import org.eclipse.cdt.internal.core.resources.ResourceExclusion; +import org.eclipse.cdt.ui.resources.Messages; +import org.eclipse.cdt.ui.resources.RefreshExclusionContributor; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IResource; @@ -41,14 +47,6 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.dialogs.CheckedTreeSelectionDialog; import org.eclipse.ui.model.WorkbenchLabelProvider; -import org.eclipse.cdt.core.resources.ExclusionInstance; -import org.eclipse.cdt.core.resources.ExclusionType; -import org.eclipse.cdt.core.resources.RefreshExclusion; -import org.eclipse.cdt.ui.resources.Messages; -import org.eclipse.cdt.ui.resources.RefreshExclusionContributor; - -import org.eclipse.cdt.internal.core.resources.ResourceExclusion; - /** * <strong>EXPERIMENTAL</strong>. This class or interface has been added as part of a work in progress. There * is no guarantee that this API will work or that it will remain the same. Please do not use this API without diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/saveactions/AlignConstSaveAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/saveactions/AlignConstSaveAction.java index ce7751a266a..ea64856b794 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/saveactions/AlignConstSaveAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/saveactions/AlignConstSaveAction.java @@ -11,14 +11,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.saveactions; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; - import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.ui.actions.AlignConstAction; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; /** * Save action to align all const specifiers in a given translation unit diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchElement.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchElement.java index 8af62b9f4de..2af404e0245 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchElement.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchElement.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.search; +import org.eclipse.cdt.core.index.IIndexFileLocation; import org.eclipse.core.filesystem.EFS; import org.eclipse.core.filesystem.IFileStore; import org.eclipse.core.resources.IFile; @@ -22,8 +23,6 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.Path; -import org.eclipse.cdt.core.index.IIndexFileLocation; - /** * Element class used to group matches. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchElementQuery.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchElementQuery.java index 60844e02f8e..457534a7ba6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchElementQuery.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchElementQuery.java @@ -15,18 +15,16 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.search; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.Status; - import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ISourceReference; - import org.eclipse.cdt.internal.ui.viewsupport.IndexUI; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.core.runtime.Status; /** * @author Doug Schaefer diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchLabelProvider.java index 4182eb4549b..f86e4b08097 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchLabelProvider.java @@ -17,6 +17,17 @@ package org.eclipse.cdt.internal.ui.search; import java.net.URI; +import org.eclipse.cdt.core.index.IIndexFileLocation; +import org.eclipse.cdt.core.index.IndexLocationFactory; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.internal.core.dom.parser.ASTProblem; +import org.eclipse.cdt.internal.core.model.TranslationUnit; +import org.eclipse.cdt.internal.ui.search.LineSearchElement.Match; +import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; +import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider; +import org.eclipse.cdt.internal.ui.viewsupport.ColoringLabelProvider; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.browser.typeinfo.TypeInfoLabelProvider; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider; @@ -28,20 +39,6 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.core.index.IIndexFileLocation; -import org.eclipse.cdt.core.index.IndexLocationFactory; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.browser.typeinfo.TypeInfoLabelProvider; - -import org.eclipse.cdt.internal.core.dom.parser.ASTProblem; -import org.eclipse.cdt.internal.core.model.TranslationUnit; - -import org.eclipse.cdt.internal.ui.search.LineSearchElement.Match; -import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; -import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider; -import org.eclipse.cdt.internal.ui.viewsupport.ColoringLabelProvider; - /** * The content in the tree and list views may be either: * <p> diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchListContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchListContentProvider.java index 5c8b2e0820b..811dfd17e03 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchListContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchListContentProvider.java @@ -19,6 +19,9 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; @@ -28,10 +31,6 @@ import org.eclipse.jface.viewers.Viewer; import com.ibm.icu.text.MessageFormat; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.CUIPlugin; - /** * @author Doug Schaefer */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchListLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchListLabelProvider.java index da2ffc9a0b4..70208fd0db8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchListLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchListLabelProvider.java @@ -16,14 +16,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.search; -import org.eclipse.jface.viewers.ViewerCell; - import org.eclipse.cdt.core.index.IndexLocationFactory; import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.ui.CDTSharedImages; - import org.eclipse.cdt.internal.ui.util.Messages; import org.eclipse.cdt.internal.ui.viewsupport.ColoringLabelProvider; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.jface.viewers.ViewerCell; /** * @author Doug Schaefer diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMatch.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMatch.java index 2a9cabdbd53..c10fafc0e87 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMatch.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMatch.java @@ -15,9 +15,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.search; -import org.eclipse.search.ui.text.Match; - import org.eclipse.cdt.core.index.IIndexFileLocation; +import org.eclipse.search.ui.text.Match; /** * Base class for search matches found by various index searches. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPage.java index 778dc0db1cc..ef3d3f77786 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPage.java @@ -18,6 +18,17 @@ import java.util.HashSet; import java.util.Set; import java.util.regex.PatternSyntaxException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICContainer; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ISourceReference; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.parser.Keywords; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.util.Messages; +import org.eclipse.cdt.internal.ui.util.RowLayouter; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IAdaptable; @@ -59,19 +70,6 @@ import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkingSet; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICContainer; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ISourceReference; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.parser.Keywords; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.util.Messages; -import org.eclipse.cdt.internal.ui.util.RowLayouter; - /** * @author Doug Schaefer */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPatternQuery.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPatternQuery.java index 6c0c74a3c87..1829ce2c1a8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPatternQuery.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPatternQuery.java @@ -21,12 +21,6 @@ import java.util.List; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.Status; - import org.eclipse.cdt.core.dom.ast.ICompositeType; import org.eclipse.cdt.core.dom.ast.IEnumeration; import org.eclipse.cdt.core.dom.ast.IEnumerator; @@ -42,6 +36,11 @@ import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.index.IIndexBinding; import org.eclipse.cdt.core.index.IndexFilter; import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.core.runtime.Status; /** * @author Doug Schaefer diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchProviderManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchProviderManager.java index fc24b19cffe..50ae63025eb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchProviderManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchProviderManager.java @@ -16,6 +16,8 @@ package org.eclipse.cdt.internal.ui.search; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.extensions.IExternalSearchProvider; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtension; @@ -24,9 +26,6 @@ import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; import org.eclipse.osgi.util.NLS; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.extensions.IExternalSearchProvider; - /** * Maintains a list of extensions implementing the org.eclipse.cdt.ui.externalSearchProviders * extension point. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchQuery.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchQuery.java index 9a24686b830..399c4471743 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchQuery.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchQuery.java @@ -28,25 +28,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.Region; -import org.eclipse.osgi.util.NLS; -import org.eclipse.search.ui.ISearchQuery; -import org.eclipse.search.ui.ISearchResult; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IPathEditorInput; -import org.eclipse.ui.texteditor.ITextEditor; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.IPositionConverter; import org.eclipse.cdt.core.browser.ITypeReference; @@ -67,17 +48,33 @@ import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.parser.util.ArrayUtil; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.extensions.IExternalSearchProvider; - import org.eclipse.cdt.internal.core.browser.ASTTypeInfo; import org.eclipse.cdt.internal.core.dom.parser.cpp.ClassTypeHelper; import org.eclipse.cdt.internal.core.model.ext.ICElementHandle; - import org.eclipse.cdt.internal.ui.search.LineSearchElement.Match; import org.eclipse.cdt.internal.ui.util.Messages; import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; import org.eclipse.cdt.internal.ui.viewsupport.IndexUI; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.extensions.IExternalSearchProvider; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; +import org.eclipse.osgi.util.NLS; +import org.eclipse.search.ui.ISearchQuery; +import org.eclipse.search.ui.ISearchResult; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IPathEditorInput; +import org.eclipse.ui.texteditor.ITextEditor; public abstract class CSearchQuery implements ISearchQuery { public static final int FIND_DECLARATIONS = IIndex.FIND_DECLARATIONS; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResult.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResult.java index 6a109be6746..a433ef12f24 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResult.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResult.java @@ -20,6 +20,11 @@ package org.eclipse.cdt.internal.ui.search; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.core.index.IIndexFileLocation; +import org.eclipse.cdt.core.index.IIndexName; +import org.eclipse.cdt.core.index.IndexLocationFactory; +import org.eclipse.cdt.internal.ui.util.ExternalEditorInput; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IStorage; import org.eclipse.core.resources.ResourcesPlugin; @@ -40,13 +45,6 @@ import org.eclipse.ui.IStorageEditorInput; import org.eclipse.ui.editors.text.ILocationProvider; import org.eclipse.ui.part.FileEditorInput; -import org.eclipse.cdt.core.index.IIndexFileLocation; -import org.eclipse.cdt.core.index.IIndexName; -import org.eclipse.cdt.core.index.IndexLocationFactory; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.util.ExternalEditorInput; - /** * @author Doug Schaefer */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchTextSelectionQuery.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchTextSelectionQuery.java index 03fe57163f0..191f8be5afd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchTextSelectionQuery.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchTextSelectionQuery.java @@ -15,12 +15,6 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.search; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.text.ITextSelection; - import org.eclipse.cdt.core.dom.ast.DOMException; import org.eclipse.cdt.core.dom.ast.EScopeKind; import org.eclipse.cdt.core.dom.ast.IASTName; @@ -32,12 +26,15 @@ import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.model.ITranslationUnit; - import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPSemantics; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPTemplates; import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; - import org.eclipse.cdt.internal.ui.editor.ASTProvider; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.text.ITextSelection; /** * Query for searching the index based on a text selection. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchTreeContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchTreeContentProvider.java index 95c77e7b94d..421778d7374 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchTreeContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchTreeContentProvider.java @@ -21,6 +21,15 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.index.IIndexFileLocation; +import org.eclipse.cdt.core.index.IndexLocationFactory; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ISourceRoot; +import org.eclipse.cdt.internal.core.resources.ResourceLookup; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; @@ -32,17 +41,6 @@ import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.index.IIndexFileLocation; -import org.eclipse.cdt.core.index.IndexLocationFactory; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ISourceRoot; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.core.resources.ResourceLookup; - /** * @author Doug Schaefer */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchTreeLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchTreeLabelProvider.java index 27efefe9691..169856a704d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchTreeLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchTreeLabelProvider.java @@ -16,14 +16,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.search; -import org.eclipse.jface.viewers.StyledString; - import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.IStructure; - import org.eclipse.cdt.internal.core.model.TranslationUnit; - import org.eclipse.cdt.internal.ui.util.Messages; +import org.eclipse.jface.viewers.StyledString; public class CSearchTreeLabelProvider extends CSearchLabelProvider { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchUnresolvedIncludesQuery.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchUnresolvedIncludesQuery.java index 4c420fa2bbf..01e3eaa95fe 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchUnresolvedIncludesQuery.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchUnresolvedIncludesQuery.java @@ -14,19 +14,17 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.search; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.osgi.util.NLS; - import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.index.IIndexFile; import org.eclipse.cdt.core.index.IIndexInclude; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.parser.IProblem; - import org.eclipse.cdt.internal.ui.util.Messages; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.osgi.util.NLS; /** * Query for searching unresolved includes in projects. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchUtil.java index cbe484bebbf..959ccd3ba96 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchUtil.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchUtil.java @@ -14,15 +14,13 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.search; -import org.eclipse.ui.IWorkingSet; - import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.cpp.ICPPVariable; - import org.eclipse.cdt.internal.core.dom.parser.c.CVariableReadWriteFlags; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVariableReadWriteFlags; import org.eclipse.cdt.internal.core.pdom.dom.PDOMName; +import org.eclipse.ui.IWorkingSet; public class CSearchUtil { public static int LRU_WORKINGSET_LIST_SIZE = 3; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchViewPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchViewPage.java index e0e06fae8f2..c72e810d17b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchViewPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchViewPage.java @@ -16,6 +16,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.search; +import org.eclipse.cdt.core.index.IIndexFileLocation; +import org.eclipse.cdt.core.index.IndexLocationFactory; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.internal.ui.viewsupport.ColoringLabelProvider; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; @@ -42,14 +48,6 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.part.IPageSite; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.core.index.IIndexFileLocation; -import org.eclipse.cdt.core.index.IndexLocationFactory; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.util.EditorUtility; -import org.eclipse.cdt.internal.ui.viewsupport.ColoringLabelProvider; - /** * Implementation of the search view page for index based searches. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CountLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CountLabelProvider.java index 4ae22a3e9c2..d5aaa8b555a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CountLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CountLabelProvider.java @@ -19,13 +19,12 @@ */ package org.eclipse.cdt.internal.ui.search; +import org.eclipse.cdt.internal.ui.util.Messages; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.search.ui.text.AbstractTextSearchViewPage; import org.eclipse.swt.graphics.Image; -import org.eclipse.cdt.internal.ui.util.Messages; - /** * @author bgheorgh * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/IPDOMSearchContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/IPDOMSearchContentProvider.java index a100f73729a..aef45ae8451 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/IPDOMSearchContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/IPDOMSearchContentProvider.java @@ -15,11 +15,10 @@ package org.eclipse.cdt.internal.ui.search; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.cdt.ui.CUIPlugin; - /** * The content in the tree and list views may be either: * <p> diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LineSearchElement.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LineSearchElement.java index a9a69170624..35a17dc1c08 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LineSearchElement.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LineSearchElement.java @@ -20,16 +20,14 @@ import java.util.Arrays; import java.util.Comparator; import java.util.List; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; - import org.eclipse.cdt.core.index.IIndexFileLocation; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.parser.FileContent; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.core.parser.scanner.AbstractCharArray; import org.eclipse.cdt.internal.core.parser.scanner.InternalFileContent; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; /** * Element representing a line with one ore more matches. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LinkedNamesFinder.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LinkedNamesFinder.java index 8e6acf28cd2..d904757b565 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LinkedNamesFinder.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LinkedNamesFinder.java @@ -19,9 +19,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.Region; - import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.DOMException; import org.eclipse.cdt.core.dom.ast.IASTComment; @@ -43,10 +40,11 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateId; import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType; import org.eclipse.cdt.core.dom.ast.cpp.ICPPConstructor; import org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod; - import org.eclipse.cdt.internal.core.dom.parser.ASTTranslationUnit; import org.eclipse.cdt.internal.core.dom.parser.cpp.ClassTypeHelper; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPSemantics; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; /** * Finds locations of linked names. Used by Rename in File and Rename in Workspace. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/OccurrencesFinder.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/OccurrencesFinder.java index c7b5582eb54..f2977839d65 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/OccurrencesFinder.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/OccurrencesFinder.java @@ -27,9 +27,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateId; import org.eclipse.cdt.core.dom.ast.cpp.ICPPConstructor; import org.eclipse.cdt.core.parser.Keywords; import org.eclipse.cdt.core.parser.util.CharArrayUtils; - import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; - import org.eclipse.cdt.internal.ui.util.Messages; public class OccurrencesFinder implements IOccurrencesFinder { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/TypeInfoSearchElement.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/TypeInfoSearchElement.java index ad23f166dbb..0ab2a5766f5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/TypeInfoSearchElement.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/TypeInfoSearchElement.java @@ -13,15 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.search; -import org.eclipse.core.runtime.CoreException; - import org.eclipse.cdt.core.browser.ITypeInfo; import org.eclipse.cdt.core.browser.IndexTypeInfo; import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.index.IIndexBinding; import org.eclipse.cdt.core.index.IIndexName; - import org.eclipse.cdt.internal.core.browser.ASTTypeInfo; +import org.eclipse.core.runtime.CoreException; /** * Represents a a c/c++-entity in a search. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/DeclarationsSearchGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/DeclarationsSearchGroup.java index 82519afc633..79628b24431 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/DeclarationsSearchGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/DeclarationsSearchGroup.java @@ -18,6 +18,11 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds; +import org.eclipse.cdt.internal.ui.search.CSearchMessages; +import org.eclipse.cdt.internal.ui.search.CSearchUtil; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.text.ITextSelection; @@ -30,13 +35,6 @@ import org.eclipse.ui.IWorkingSet; import org.eclipse.ui.actions.ActionGroup; import org.eclipse.ui.texteditor.ITextEditorActionConstants; -import org.eclipse.cdt.core.model.ICElement; - -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds; -import org.eclipse.cdt.internal.ui.search.CSearchMessages; -import org.eclipse.cdt.internal.ui.search.CSearchUtil; - public class DeclarationsSearchGroup extends ActionGroup { private CEditor fEditor; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindAction.java index 17c9499a94e..9636633c1cd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindAction.java @@ -14,6 +14,15 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.search.actions; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ISourceReference; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.search.CSearchElementQuery; +import org.eclipse.cdt.internal.ui.search.CSearchMessages; +import org.eclipse.cdt.internal.ui.search.CSearchQuery; +import org.eclipse.cdt.internal.ui.search.CSearchTextSelectionQuery; +import org.eclipse.cdt.internal.ui.text.CWordFinder; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.ITextSelection; @@ -24,17 +33,6 @@ import org.eclipse.search.ui.ISearchQuery; import org.eclipse.search.ui.NewSearchUI; import org.eclipse.ui.IWorkbenchSite; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ISourceReference; -import org.eclipse.cdt.core.model.ITranslationUnit; - -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.search.CSearchMessages; -import org.eclipse.cdt.internal.ui.search.CSearchElementQuery; -import org.eclipse.cdt.internal.ui.search.CSearchQuery; -import org.eclipse.cdt.internal.ui.search.CSearchTextSelectionQuery; -import org.eclipse.cdt.internal.ui.text.CWordFinder; - public abstract class FindAction extends SelectionParseAction { public FindAction(CEditor editor) { super(editor); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsInWorkingSetAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsInWorkingSetAction.java index da7b45dd320..12a43ff3180 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsInWorkingSetAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsInWorkingSetAction.java @@ -14,12 +14,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.search.actions; -import org.eclipse.ui.IWorkbenchSite; -import org.eclipse.ui.IWorkingSet; - import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.cdt.internal.ui.search.CSearchMessages; import org.eclipse.cdt.internal.ui.search.CSearchQuery; +import org.eclipse.ui.IWorkbenchSite; +import org.eclipse.ui.IWorkingSet; public class FindDeclarationsInWorkingSetAction extends FindInWorkingSetAction { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindInWorkingSetAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindInWorkingSetAction.java index e2fe7e271d3..5e03c3e1d5a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindInWorkingSetAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindInWorkingSetAction.java @@ -16,6 +16,11 @@ package org.eclipse.cdt.internal.ui.search.actions; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.search.CSearchMessages; +import org.eclipse.cdt.internal.ui.search.CSearchUtil; +import org.eclipse.cdt.internal.ui.util.Messages; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.window.Window; import org.eclipse.ui.IWorkbenchSite; @@ -24,13 +29,6 @@ import org.eclipse.ui.IWorkingSetManager; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.IWorkingSetSelectionDialog; -import org.eclipse.cdt.core.model.ICElement; - -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.search.CSearchMessages; -import org.eclipse.cdt.internal.ui.search.CSearchUtil; -import org.eclipse.cdt.internal.ui.util.Messages; - public abstract class FindInWorkingSetAction extends FindAction { private IWorkingSet[] fWorkingSets; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsInWorkingSetAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsInWorkingSetAction.java index 3f1d841d77c..c22c0c1851d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsInWorkingSetAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsInWorkingSetAction.java @@ -14,12 +14,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.search.actions; -import org.eclipse.ui.IWorkbenchSite; -import org.eclipse.ui.IWorkingSet; - import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.cdt.internal.ui.search.CSearchMessages; import org.eclipse.cdt.internal.ui.search.CSearchQuery; +import org.eclipse.ui.IWorkbenchSite; +import org.eclipse.ui.IWorkingSet; public class FindRefsInWorkingSetAction extends FindInWorkingSetAction { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindUnresolvedIncludesProjectAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindUnresolvedIncludesProjectAction.java index 262a47896b6..9c3f2e4dc32 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindUnresolvedIncludesProjectAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindUnresolvedIncludesProjectAction.java @@ -13,18 +13,16 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.search.actions; -import org.eclipse.jface.action.IAction; -import org.eclipse.search.ui.ISearchQuery; -import org.eclipse.search.ui.NewSearchUI; -import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.IWorkbenchSite; - import org.eclipse.cdt.core.model.ICElement; - import org.eclipse.cdt.internal.ui.actions.AbstractUpdateIndexAction; import org.eclipse.cdt.internal.ui.search.CSearchMessages; import org.eclipse.cdt.internal.ui.search.CSearchUnresolvedIncludesQuery; import org.eclipse.cdt.internal.ui.util.StatusLineHandler; +import org.eclipse.jface.action.IAction; +import org.eclipse.search.ui.ISearchQuery; +import org.eclipse.search.ui.NewSearchUI; +import org.eclipse.ui.IWorkbenchPart; +import org.eclipse.ui.IWorkbenchSite; /** * Searches projects for unresolved includes. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java index bbdc8434c09..d7d294f12d5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java @@ -17,22 +17,20 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.search.actions; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.ITextSelection; - import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.ICModelBasedEditor; - import org.eclipse.cdt.internal.ui.actions.OpenActionUtil; import org.eclipse.cdt.internal.ui.editor.CEditorMessages; import org.eclipse.cdt.internal.ui.text.CWordFinder; import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.ICModelBasedEditor; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.ITextSelection; /** * Navigates to the definition of a name, or to the declaration if invoked on the definition. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsJob.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsJob.java index 1a7c89b8130..ec2cb0d5e62 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsJob.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsJob.java @@ -30,18 +30,6 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.text.Region; -import org.eclipse.swt.widgets.Display; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IName; import org.eclipse.cdt.core.dom.ast.ASTNameCollector; @@ -98,8 +86,6 @@ import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.model.IWorkingCopy; import org.eclipse.cdt.core.parser.util.ArrayUtil; import org.eclipse.cdt.core.parser.util.CharArrayUtils; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.core.dom.parser.ASTNode; import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPUnknownBinding; @@ -113,7 +99,6 @@ import org.eclipse.cdt.internal.core.index.IIndexFragmentName; import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; import org.eclipse.cdt.internal.core.model.ext.CElementHandleFactory; import org.eclipse.cdt.internal.core.model.ext.ICElementHandle; - import org.eclipse.cdt.internal.ui.actions.OpenActionUtil; import org.eclipse.cdt.internal.ui.actions.SelectionConverter; import org.eclipse.cdt.internal.ui.editor.ASTProvider; @@ -121,6 +106,18 @@ import org.eclipse.cdt.internal.ui.editor.CEditorMessages; import org.eclipse.cdt.internal.ui.editor.CElementIncludeResolver; import org.eclipse.cdt.internal.ui.search.actions.OpenDeclarationsAction.ITargetDisambiguator; import org.eclipse.cdt.internal.ui.viewsupport.IndexUI; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.jface.text.Region; +import org.eclipse.swt.widgets.Display; class OpenDeclarationsJob extends Job implements ASTRunnable { private enum NameKind { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/ReferencesSearchGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/ReferencesSearchGroup.java index 187d9f1c565..1a5e10a7bfa 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/ReferencesSearchGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/ReferencesSearchGroup.java @@ -16,6 +16,10 @@ package org.eclipse.cdt.internal.ui.search.actions; import java.util.ArrayList; import java.util.Iterator; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds; +import org.eclipse.cdt.internal.ui.search.CSearchMessages; +import org.eclipse.cdt.internal.ui.search.CSearchUtil; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.search.ui.IContextMenuConstants; @@ -25,11 +29,6 @@ import org.eclipse.ui.IWorkingSet; import org.eclipse.ui.actions.ActionGroup; import org.eclipse.ui.texteditor.ITextEditorActionConstants; -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds; -import org.eclipse.cdt.internal.ui.search.CSearchMessages; -import org.eclipse.cdt.internal.ui.search.CSearchUtil; - public class ReferencesSearchGroup extends ActionGroup { private FindRefsAction fFindRefsAction; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionParseAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionParseAction.java index 99af9842110..9dd79dd4ecd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionParseAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionParseAction.java @@ -17,6 +17,11 @@ package org.eclipse.cdt.internal.ui.search.actions; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.search.CSearchMessages; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.internal.ui.util.StatusLineHandler; +import org.eclipse.cdt.ui.ICModelBasedEditor; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.jface.action.Action; @@ -28,13 +33,6 @@ import org.eclipse.ui.texteditor.ITextEditor; import com.ibm.icu.text.MessageFormat; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.ICModelBasedEditor; - -import org.eclipse.cdt.internal.ui.search.CSearchMessages; -import org.eclipse.cdt.internal.ui.util.EditorUtility; -import org.eclipse.cdt.internal.ui.util.StatusLineHandler; - /** * @author aniefer * Created on Jun 2, 2004 diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionSearchGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionSearchGroup.java index 2cf4d2d118e..8656e1714f4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionSearchGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionSearchGroup.java @@ -15,6 +15,8 @@ package org.eclipse.cdt.internal.ui.search.actions; import java.util.List; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.text.ITextSelection; @@ -25,10 +27,6 @@ import org.eclipse.ui.IWorkbenchSite; import org.eclipse.ui.actions.ActionGroup; import org.eclipse.ui.part.Page; -import org.eclipse.cdt.core.model.ICElement; - -import org.eclipse.cdt.internal.ui.editor.CEditor; - public class SelectionSearchGroup extends ActionGroup { private CEditor fEditor; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractCompareViewerInformationControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractCompareViewerInformationControl.java index e945dedc8fb..4484f0383fd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractCompareViewerInformationControl.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractCompareViewerInformationControl.java @@ -13,6 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text; +import org.eclipse.cdt.internal.ui.text.c.hover.SourceViewerInformationControl; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.compare.CompareConfiguration; import org.eclipse.compare.CompareUI; import org.eclipse.compare.structuremergeviewer.ICompareInput; @@ -44,11 +47,6 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; - -import org.eclipse.cdt.internal.ui.text.c.hover.SourceViewerInformationControl; - /** * Abstract class for "quick" compare views in light-weight controls. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractInformationControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractInformationControl.java index c10b502afe1..11b2dd88a83 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractInformationControl.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractInformationControl.java @@ -18,6 +18,14 @@ package org.eclipse.cdt.internal.ui.text; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.IParent; +import org.eclipse.cdt.core.parser.Keywords; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.internal.ui.util.StringMatcher; +import org.eclipse.cdt.ui.CElementGrouping; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.actions.CustomFiltersActionGroup; import org.eclipse.core.commands.Command; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.action.IMenuManager; @@ -66,16 +74,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.commands.ICommandService; import org.eclipse.ui.keys.IBindingService; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.IParent; -import org.eclipse.cdt.core.parser.Keywords; -import org.eclipse.cdt.ui.CElementGrouping; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.actions.CustomFiltersActionGroup; - -import org.eclipse.cdt.internal.ui.util.EditorUtility; -import org.eclipse.cdt.internal.ui.util.StringMatcher; - /** * Abstract class for "quick" views in light-weight controls. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractSourceViewerInformationControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractSourceViewerInformationControl.java index 21bd2607e8b..8f523dd58b2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractSourceViewerInformationControl.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractSourceViewerInformationControl.java @@ -13,6 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text; +import org.eclipse.cdt.internal.ui.editor.CSourceViewer; +import org.eclipse.cdt.internal.ui.text.c.hover.SourceViewerInformationControl; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.jface.resource.JFaceResources; @@ -39,13 +44,6 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.ICPartitions; - -import org.eclipse.cdt.internal.ui.editor.CSourceViewer; -import org.eclipse.cdt.internal.ui.text.c.hover.SourceViewerInformationControl; - /** * Abstract class for "quick" source views in light-weight controls. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/BufferedDocumentScanner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/BufferedDocumentScanner.java index 55ed709134d..1a05aca821d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/BufferedDocumentScanner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/BufferedDocumentScanner.java @@ -14,10 +14,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text; +import org.eclipse.core.runtime.Assert; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.rules.ICharacterScanner; -import org.eclipse.core.runtime.Assert; /** * A buffered document scanner. The buffer always contains a section diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CAutoIndentStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CAutoIndentStrategy.java index f311b2c5f49..df5823dcccd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CAutoIndentStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CAutoIndentStrategy.java @@ -18,6 +18,13 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.internal.corext.util.CodeFormatterUtil; +import org.eclipse.cdt.internal.ui.editor.IndentUtil; +import org.eclipse.cdt.internal.ui.text.CIndenter.MatchMode; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.BadLocationException; @@ -36,16 +43,6 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.part.MultiPageEditorPart; import org.eclipse.ui.texteditor.ITextEditorExtension3; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.ICPartitions; - -import org.eclipse.cdt.internal.corext.util.CodeFormatterUtil; - -import org.eclipse.cdt.internal.ui.editor.IndentUtil; -import org.eclipse.cdt.internal.ui.text.CIndenter.MatchMode; - /** * Auto indent strategy sensitive to brackets. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCodeScanner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCodeScanner.java index 98d39bc0b9d..31ceaff2d51 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCodeScanner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCodeScanner.java @@ -19,16 +19,14 @@ package org.eclipse.cdt.internal.ui.text; import java.util.ArrayList; import java.util.List; -import org.eclipse.jface.text.rules.IRule; -import org.eclipse.jface.text.rules.IToken; -import org.eclipse.jface.text.rules.WordRule; - import org.eclipse.cdt.core.model.ICLanguageKeywords; +import org.eclipse.cdt.internal.ui.text.util.CWordDetector; import org.eclipse.cdt.ui.text.AbstractCScanner; import org.eclipse.cdt.ui.text.ICColorConstants; import org.eclipse.cdt.ui.text.ITokenStoreFactory; - -import org.eclipse.cdt.internal.ui.text.util.CWordDetector; +import org.eclipse.jface.text.rules.IRule; +import org.eclipse.jface.text.rules.IToken; +import org.eclipse.jface.text.rules.WordRule; /** * A C/C++ code scanner. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCommentScanner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCommentScanner.java index 7b5c68bf925..310ff9cd4dc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCommentScanner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCommentScanner.java @@ -18,12 +18,11 @@ package org.eclipse.cdt.internal.ui.text; import java.util.Collections; import java.util.List; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.text.rules.IRule; - import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.cdt.ui.text.AbstractCScanner; import org.eclipse.cdt.ui.text.ITokenStoreFactory; +import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.jface.text.rules.IRule; /** * Default token-scanner used for plain (non-documentation-comment) single and multi-line comments, with awareness of diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCompositeReconcilingStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCompositeReconcilingStrategy.java index 1dc1749c22c..2c500027cd0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCompositeReconcilingStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCompositeReconcilingStrategy.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text; +import org.eclipse.cdt.internal.ui.text.spelling.CSpellingReconcileStrategy; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.reconciler.DirtyRegion; import org.eclipse.jface.text.reconciler.IReconcilingStrategy; @@ -21,8 +22,6 @@ import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.ui.texteditor.IDocumentProvider; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.internal.ui.text.spelling.CSpellingReconcileStrategy; - /** * Reconciling strategy for C/C++ code. This is a composite strategy containing * the regular C/C++ model reconciler and the comment spelling strategy. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CFormattingStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CFormattingStrategy.java index 43ed65e81da..57e6e8709d3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CFormattingStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CFormattingStrategy.java @@ -19,6 +19,9 @@ import java.util.ArrayDeque; import java.util.Deque; import java.util.Map; +import org.eclipse.cdt.core.formatter.CodeFormatter; +import org.eclipse.cdt.internal.corext.util.CodeFormatterUtil; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.TextUtilities; @@ -29,11 +32,6 @@ import org.eclipse.jface.text.formatter.IFormattingContext; import org.eclipse.text.edits.MalformedTreeException; import org.eclipse.text.edits.TextEdit; -import org.eclipse.cdt.core.formatter.CodeFormatter; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.corext.util.CodeFormatterUtil; - /** * @author AChapiro */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CHelpProviderDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CHelpProviderDescriptor.java index 7da1cf4a366..40b7ab39df3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CHelpProviderDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CHelpProviderDescriptor.java @@ -18,6 +18,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.eclipse.cdt.ui.ICHelpBook; +import org.eclipse.cdt.ui.ICHelpProvider; +import org.eclipse.cdt.ui.text.ICHelpInvocationContext; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.ISafeRunnable; @@ -26,10 +29,6 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import org.eclipse.cdt.ui.ICHelpBook; -import org.eclipse.cdt.ui.ICHelpProvider; -import org.eclipse.cdt.ui.text.ICHelpInvocationContext; - /** * This class represents the CHelpProvider settings * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CHeuristicScanner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CHeuristicScanner.java index c6d0d558c5f..02f7af3cad5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CHeuristicScanner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CHeuristicScanner.java @@ -18,6 +18,7 @@ package org.eclipse.cdt.internal.ui.text; import java.util.Arrays; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; @@ -27,8 +28,6 @@ import org.eclipse.jface.text.Region; import org.eclipse.jface.text.TextUtilities; import org.eclipse.jface.text.TypedRegion; -import org.eclipse.cdt.ui.text.ICPartitions; - /** * Utility methods for heuristic based C manipulations in an incomplete C source file. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CIndenter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CIndenter.java index 0832ea30b5f..e6d75db1d0e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CIndenter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CIndenter.java @@ -17,6 +17,10 @@ package org.eclipse.cdt.internal.ui.text; import static org.eclipse.cdt.internal.ui.text.CHeuristicScanner.NOT_FOUND; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.internal.corext.util.CodeFormatterUtil; import org.eclipse.core.resources.ProjectScope; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.Platform; @@ -28,12 +32,6 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; -import org.eclipse.cdt.core.model.ICProject; - -import org.eclipse.cdt.internal.corext.util.CodeFormatterUtil; - /** * Uses the {@link org.eclipse.cdt.internal.ui.text.CHeuristicScanner} to * get the indentation level for a certain position in a document. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/COutlineInformationControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/COutlineInformationControl.java index 171fd18c7c5..464924753d1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/COutlineInformationControl.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/COutlineInformationControl.java @@ -16,6 +16,15 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.editor.CContentOutlinerProvider; +import org.eclipse.cdt.internal.ui.editor.LexicalSortingAction; +import org.eclipse.cdt.internal.ui.util.ProblemTreeViewer; +import org.eclipse.cdt.internal.ui.viewsupport.AppearanceAwareLabelProvider; +import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; +import org.eclipse.cdt.internal.ui.viewsupport.DecoratingCLabelProvider; +import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.Separator; import org.eclipse.jface.viewers.AbstractTreeViewer; @@ -26,17 +35,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Tree; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.PreferenceConstants; - -import org.eclipse.cdt.internal.ui.editor.CContentOutlinerProvider; -import org.eclipse.cdt.internal.ui.editor.LexicalSortingAction; -import org.eclipse.cdt.internal.ui.util.ProblemTreeViewer; -import org.eclipse.cdt.internal.ui.viewsupport.AppearanceAwareLabelProvider; -import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; -import org.eclipse.cdt.internal.ui.viewsupport.DecoratingCLabelProvider; - /** * Control which shows outline information in C/C++ editor. Based on * AbstracInformationContol/JavaOutlineInformationControl from JDT. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CPairMatcher.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CPairMatcher.java index 0af4f83713d..81d4156077d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CPairMatcher.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CPairMatcher.java @@ -15,6 +15,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text; +import org.eclipse.cdt.core.dom.ILinkage; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; @@ -23,10 +26,6 @@ import org.eclipse.jface.text.TextUtilities; import org.eclipse.jface.text.source.DefaultCharacterPairMatcher; import org.eclipse.jface.text.source.ICharacterPairMatcher; -import org.eclipse.cdt.core.dom.ILinkage; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.ui.text.ICPartitions; - /** * Helper class to match pairs of characters. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CParameterListValidator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CParameterListValidator.java index 11084bbf995..20c7a1452aa 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CParameterListValidator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CParameterListValidator.java @@ -18,6 +18,7 @@ package org.eclipse.cdt.internal.ui.text; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.internal.ui.text.contentassist.CProposalContextInformation; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; @@ -29,8 +30,6 @@ import org.eclipse.jface.text.contentassist.IContextInformationValidator; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.StyleRange; -import org.eclipse.cdt.internal.ui.text.contentassist.CProposalContextInformation; - /** * This class provides the function parameter parsing for the C/C++ Editor hover. * It is based heavily on the Java class JavaParameterListValidator. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CPreprocessorScanner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CPreprocessorScanner.java index ead9d890c65..13763e2c701 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CPreprocessorScanner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CPreprocessorScanner.java @@ -17,17 +17,15 @@ package org.eclipse.cdt.internal.ui.text; import java.util.ArrayList; import java.util.List; -import org.eclipse.jface.text.rules.IRule; -import org.eclipse.jface.text.rules.IToken; -import org.eclipse.jface.text.rules.PatternRule; -import org.eclipse.jface.text.rules.WordRule; - import org.eclipse.cdt.core.model.ICLanguageKeywords; +import org.eclipse.cdt.internal.ui.text.util.CWordDetector; import org.eclipse.cdt.ui.text.AbstractCScanner; import org.eclipse.cdt.ui.text.ICColorConstants; import org.eclipse.cdt.ui.text.ITokenStoreFactory; - -import org.eclipse.cdt.internal.ui.text.util.CWordDetector; +import org.eclipse.jface.text.rules.IRule; +import org.eclipse.jface.text.rules.IToken; +import org.eclipse.jface.text.rules.PatternRule; +import org.eclipse.jface.text.rules.WordRule; /** * A scanner for preprocessor directives. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconciler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconciler.java index f4fa7d72141..cda418fa86e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconciler.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconciler.java @@ -14,6 +14,21 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.index.IIndexChangeEvent; +import org.eclipse.cdt.core.index.IIndexChangeListener; +import org.eclipse.cdt.core.index.IIndexerStateEvent; +import org.eclipse.cdt.core.index.IIndexerStateListener; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ElementChangedEvent; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICElementDelta; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.IElementChangedListener; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.IWorkingCopyManager; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; @@ -38,22 +53,6 @@ import org.eclipse.ui.IWorkbenchPartSite; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.index.IIndexChangeEvent; -import org.eclipse.cdt.core.index.IIndexChangeListener; -import org.eclipse.cdt.core.index.IIndexerStateEvent; -import org.eclipse.cdt.core.index.IIndexerStateListener; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ElementChangedEvent; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICElementDelta; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.IElementChangedListener; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.IWorkingCopyManager; - /** * A single strategy C reconciler. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconcilingStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconcilingStrategy.java index 1e00c60f1ce..902230178d3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconcilingStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconcilingStrategy.java @@ -15,6 +15,13 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.cdt.internal.core.dom.parser.ASTTranslationUnit; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.IWorkingCopyManager; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.OperationCanceledException; @@ -26,15 +33,6 @@ import org.eclipse.jface.text.reconciler.IReconcilingStrategy; import org.eclipse.jface.text.reconciler.IReconcilingStrategyExtension; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.index.IIndex; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.IWorkingCopyManager; - -import org.eclipse.cdt.internal.core.dom.parser.ASTTranslationUnit; - public class CReconcilingStrategy implements IReconcilingStrategy, IReconcilingStrategyExtension { private ITextEditor fEditor; private IWorkingCopyManager fManager; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerScalableConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerScalableConfiguration.java index 846a6a7afa8..2129296e58e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerScalableConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerScalableConfiguration.java @@ -14,18 +14,16 @@ package org.eclipse.cdt.internal.ui.text; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.CSourceViewerConfiguration; +import org.eclipse.cdt.ui.text.IColorManager; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.presentation.IPresentationReconciler; import org.eclipse.jface.text.reconciler.IReconciler; import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.CSourceViewerConfiguration; -import org.eclipse.cdt.ui.text.IColorManager; - -import org.eclipse.cdt.internal.ui.editor.CEditor; - /** * Configuration for an <code>SourceViewer</code> which shows C/C++ code. * It turns off some editor features when scalability mode options are enabled. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CStringAutoIndentStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CStringAutoIndentStrategy.java index 909b7dce995..f018035abbd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CStringAutoIndentStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CStringAutoIndentStrategy.java @@ -15,6 +15,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.DefaultIndentLineAutoEditStrategy; @@ -27,10 +30,6 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.part.MultiPageEditorPart; import org.eclipse.ui.texteditor.ITextEditorExtension3; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; - /** * Auto indent strategy for C strings */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CStringDoubleClickSelector.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CStringDoubleClickSelector.java index 44048fef3fa..68220bdd7f7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CStringDoubleClickSelector.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CStringDoubleClickSelector.java @@ -14,6 +14,8 @@ package org.eclipse.cdt.internal.ui.text; +import org.eclipse.cdt.internal.ui.editor.CDocumentSetupParticipant; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.IDocument; @@ -24,10 +26,6 @@ import org.eclipse.jface.text.ITypedRegion; import org.eclipse.jface.text.Region; import org.eclipse.jface.text.TextUtilities; -import org.eclipse.cdt.ui.text.ICPartitions; - -import org.eclipse.cdt.internal.ui.editor.CDocumentSetupParticipant; - /** * Double click strategy aware of string and character syntax rules. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CTextTools.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CTextTools.java index b386f5a641d..d5c9f8fd5b8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CTextTools.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CTextTools.java @@ -16,6 +16,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text; +import org.eclipse.cdt.internal.ui.text.doctools.DocCommentOwnerManager; +import org.eclipse.cdt.internal.ui.text.util.CColorManager; +import org.eclipse.cdt.ui.text.CSourceViewerConfiguration; +import org.eclipse.cdt.ui.text.ICPartitions; +import org.eclipse.cdt.ui.text.IColorManager; +import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; import org.eclipse.core.filebuffers.LocationKind; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.ResourcesPlugin; @@ -25,14 +31,6 @@ import org.eclipse.jface.text.IDocumentExtension3; import org.eclipse.jface.text.IDocumentPartitioner; import org.eclipse.jface.text.rules.IPartitionTokenScanner; -import org.eclipse.cdt.ui.text.CSourceViewerConfiguration; -import org.eclipse.cdt.ui.text.ICPartitions; -import org.eclipse.cdt.ui.text.IColorManager; -import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; - -import org.eclipse.cdt.internal.ui.text.doctools.DocCommentOwnerManager; -import org.eclipse.cdt.internal.ui.text.util.CColorManager; - /** * Tools required to configure a C/C++ source viewer. * Scanners must be configured using a {@link CSourceViewerConfiguration}. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CWordIterator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CWordIterator.java index b519901a5e2..110cbabf435 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CWordIterator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CWordIterator.java @@ -14,11 +14,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text; -import com.ibm.icu.text.BreakIterator; import java.text.CharacterIterator; import org.eclipse.core.runtime.Assert; +import com.ibm.icu.text.BreakIterator; + /** * Breaks C text into word starts, also stops at line start and end. No * direction dependency. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CombinedWordRule.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CombinedWordRule.java index 98ce819224b..5da2ece78f8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CombinedWordRule.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CombinedWordRule.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.Map; import org.eclipse.core.runtime.Assert; - import org.eclipse.jface.text.rules.ICharacterScanner; import org.eclipse.jface.text.rules.IRule; import org.eclipse.jface.text.rules.IToken; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CompositeReconcilingStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CompositeReconcilingStrategy.java index 909a9207111..c988226416f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CompositeReconcilingStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CompositeReconcilingStrategy.java @@ -14,7 +14,6 @@ package org.eclipse.cdt.internal.ui.text; import org.eclipse.core.runtime.IProgressMonitor; - import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.reconciler.DirtyRegion; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/FastCPartitionScanner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/FastCPartitionScanner.java index c5d14418b4b..c38dd0526d1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/FastCPartitionScanner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/FastCPartitionScanner.java @@ -17,6 +17,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text; +import org.eclipse.cdt.ui.text.ICPartitions; +import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.rules.ICharacterScanner; @@ -24,9 +26,6 @@ import org.eclipse.jface.text.rules.IPartitionTokenScanner; import org.eclipse.jface.text.rules.IToken; import org.eclipse.jface.text.rules.Token; -import org.eclipse.cdt.ui.text.ICPartitions; -import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; - /** * This scanner recognizes the C multi line comments, C single line comments, * C strings, C characters and C preprocessor directives. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/FastCPartitioner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/FastCPartitioner.java index 8efae427f7b..83d2eb8754a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/FastCPartitioner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/FastCPartitioner.java @@ -14,14 +14,13 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text; +import org.eclipse.cdt.ui.text.ICPartitions; +import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.ITypedRegion; import org.eclipse.jface.text.rules.FastPartitioner; import org.eclipse.jface.text.rules.IPartitionTokenScanner; -import org.eclipse.cdt.ui.text.ICPartitions; -import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; - /** * A slightly adapted FastPartitioner. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/HTMLAnnotationHover.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/HTMLAnnotationHover.java index 5eb11346314..1abe07ff5b3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/HTMLAnnotationHover.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/HTMLAnnotationHover.java @@ -16,9 +16,8 @@ package org.eclipse.cdt.internal.ui.text; import java.util.Iterator; import java.util.List; -import org.eclipse.jface.text.source.DefaultAnnotationHover; - import org.eclipse.cdt.internal.ui.CUIMessages; +import org.eclipse.jface.text.source.DefaultAnnotationHover; /** * Determines all annotations for the given line and collects, concatenates, and formats diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/ICReconcilingListener.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/ICReconcilingListener.java index fd351362ba8..b9948c94df3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/ICReconcilingListener.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/ICReconcilingListener.java @@ -14,9 +14,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text; -import org.eclipse.core.runtime.IProgressMonitor; - import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.core.runtime.IProgressMonitor; /** * Interface of an object listening to (AST-) reconciling. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/LineComparator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/LineComparator.java index eb15d8b9d32..b8a0221fbf0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/LineComparator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/LineComparator.java @@ -14,13 +14,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.compare.rangedifferencer.IRangeComparator; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; -import org.eclipse.cdt.ui.CUIPlugin; - /** * This implementation of <code>IRangeComparator</code> compares lines of a document. * The lines are compared using a DJB hash function. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SimpleCSourceViewerConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SimpleCSourceViewerConfiguration.java index d15e4204e25..0ecc47343c6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SimpleCSourceViewerConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SimpleCSourceViewerConfiguration.java @@ -15,6 +15,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text; +import org.eclipse.cdt.ui.text.CSourceViewerConfiguration; +import org.eclipse.cdt.ui.text.IColorManager; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.IAutoEditStrategy; import org.eclipse.jface.text.IInformationControlCreator; @@ -26,9 +28,6 @@ import org.eclipse.jface.text.source.IAnnotationHover; import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.ui.text.CSourceViewerConfiguration; -import org.eclipse.cdt.ui.text.IColorManager; - /** * A simple {@linkplain org.eclipse.cdt.ui.text.CSourceViewerConfiguration C source viewer configuration}. * <p> diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/TaskTagRule.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/TaskTagRule.java index c9d85afa69c..ed220f88de6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/TaskTagRule.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/TaskTagRule.java @@ -19,6 +19,8 @@ package org.eclipse.cdt.internal.ui.text; import java.util.HashMap; import java.util.Map; +import org.eclipse.cdt.core.CCorePreferenceConstants; +import org.eclipse.cdt.ui.IPropertyChangeParticipant; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.rules.ICharacterScanner; @@ -27,9 +29,6 @@ import org.eclipse.jface.text.rules.IWordDetector; import org.eclipse.jface.text.rules.Token; import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.cdt.core.CCorePreferenceConstants; -import org.eclipse.cdt.ui.IPropertyChangeParticipant; - /** * Which words should be recognized as task tags is specified under {@link CCorePreferenceConstants#TODO_TASK_TAGS} as a * comma delimited list. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/TokenStore.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/TokenStore.java index 66c82bb28ff..3b1af804352 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/TokenStore.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/TokenStore.java @@ -18,6 +18,9 @@ package org.eclipse.cdt.internal.ui.text; import java.util.HashMap; import java.util.Map; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.IColorManager; +import org.eclipse.cdt.ui.text.ITokenStore; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.jface.resource.StringConverter; @@ -30,10 +33,6 @@ import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.widgets.Display; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.IColorManager; -import org.eclipse.cdt.ui.text.ITokenStore; - /** * Maintains a pool of tokens identified by a String ID. * Supports styles per token. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/asm/AsmPartitionScanner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/asm/AsmPartitionScanner.java index 3921ee2c0ea..8644d14c985 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/asm/AsmPartitionScanner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/asm/AsmPartitionScanner.java @@ -15,6 +15,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text.asm; +import org.eclipse.cdt.internal.ui.text.BufferedDocumentScanner; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.rules.ICharacterScanner; @@ -22,10 +24,6 @@ import org.eclipse.jface.text.rules.IPartitionTokenScanner; import org.eclipse.jface.text.rules.IToken; import org.eclipse.jface.text.rules.Token; -import org.eclipse.cdt.ui.text.ICPartitions; - -import org.eclipse.cdt.internal.ui.text.BufferedDocumentScanner; - /** * This scanner recognizes * <ul> diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AbstractAnnotationHover.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AbstractAnnotationHover.java index 91b48f9f301..ef48b63f324 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AbstractAnnotationHover.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AbstractAnnotationHover.java @@ -18,6 +18,9 @@ package org.eclipse.cdt.internal.ui.text.c.hover; import java.util.Iterator; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.internal.ui.editor.CAnnotationIterator; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.filebuffers.FileBuffers; import org.eclipse.core.filebuffers.ITextFileBufferManager; import org.eclipse.core.filebuffers.LocationKind; @@ -84,11 +87,6 @@ import org.eclipse.ui.texteditor.DefaultMarkerAnnotationAccess; import com.ibm.icu.text.MessageFormat; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.internal.ui.editor.CAnnotationIterator; - /** * AbstractAnnotationHover * Abstract super class for annotation hovers. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AbstractCEditorTextHover.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AbstractCEditorTextHover.java index c71a0dcf625..8b889f9ba65 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AbstractCEditorTextHover.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AbstractCEditorTextHover.java @@ -15,6 +15,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text.c.hover; +import org.eclipse.cdt.internal.ui.text.CWordFinder; +import org.eclipse.cdt.ui.text.c.hover.ICEditorTextHover; import org.eclipse.jface.text.DefaultInformationControl; import org.eclipse.jface.text.IInformationControl; import org.eclipse.jface.text.IInformationControlCreator; @@ -29,10 +31,6 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.editors.text.EditorsUI; -import org.eclipse.cdt.ui.text.c.hover.ICEditorTextHover; - -import org.eclipse.cdt.internal.ui.text.CWordFinder; - /** * Abstract class for providing hover information for C elements. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AnnotationExpandHover.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AnnotationExpandHover.java index 1b0765969ec..1379343d28c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AnnotationExpandHover.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AnnotationExpandHover.java @@ -22,14 +22,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.eclipse.swt.SWT; -import org.eclipse.swt.custom.StyledText; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.widgets.Menu; -import org.eclipse.swt.widgets.Shell; - -import org.eclipse.jface.viewers.IDoubleClickListener; - +import org.eclipse.cdt.internal.ui.text.c.hover.AnnotationExpansionControl.AnnotationHoverInput; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IInformationControl; @@ -50,8 +43,12 @@ import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.jface.text.source.IVerticalRulerListener; import org.eclipse.jface.text.source.LineRange; import org.eclipse.jface.text.source.VerticalRulerEvent; - -import org.eclipse.cdt.internal.ui.text.c.hover.AnnotationExpansionControl.AnnotationHoverInput; +import org.eclipse.jface.viewers.IDoubleClickListener; +import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.StyledText; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.widgets.Menu; +import org.eclipse.swt.widgets.Shell; /** * This class was copied from org.eclipse.jdt.internal.ui.text.java.hover.AnnotationExpansionControl diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AnnotationExpansionControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AnnotationExpansionControl.java index b8abab670e4..fd075145ab5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AnnotationExpansionControl.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AnnotationExpansionControl.java @@ -18,6 +18,27 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.eclipse.jface.text.AbstractInformationControlManager; +import org.eclipse.jface.text.DefaultInformationControl; +import org.eclipse.jface.text.IInformationControl; +import org.eclipse.jface.text.IInformationControlCreator; +import org.eclipse.jface.text.IInformationControlExtension; +import org.eclipse.jface.text.IInformationControlExtension2; +import org.eclipse.jface.text.IInformationControlExtension5; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.IViewportListener; +import org.eclipse.jface.text.Position; +import org.eclipse.jface.text.Region; +import org.eclipse.jface.text.TextViewer; +import org.eclipse.jface.text.source.Annotation; +import org.eclipse.jface.text.source.IAnnotationAccess; +import org.eclipse.jface.text.source.IAnnotationAccessExtension; +import org.eclipse.jface.text.source.IAnnotationModel; +import org.eclipse.jface.text.source.ISourceViewer; +import org.eclipse.jface.text.source.IVerticalRulerInfo; +import org.eclipse.jface.text.source.IVerticalRulerListener; +import org.eclipse.jface.text.source.VerticalRulerEvent; +import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.StyleRange; import org.eclipse.swt.custom.StyledText; @@ -49,29 +70,6 @@ import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Widget; -import org.eclipse.jface.viewers.IDoubleClickListener; - -import org.eclipse.jface.text.AbstractInformationControlManager; -import org.eclipse.jface.text.DefaultInformationControl; -import org.eclipse.jface.text.IInformationControl; -import org.eclipse.jface.text.IInformationControlCreator; -import org.eclipse.jface.text.IInformationControlExtension; -import org.eclipse.jface.text.IInformationControlExtension2; -import org.eclipse.jface.text.IInformationControlExtension5; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.IViewportListener; -import org.eclipse.jface.text.Position; -import org.eclipse.jface.text.Region; -import org.eclipse.jface.text.TextViewer; -import org.eclipse.jface.text.source.Annotation; -import org.eclipse.jface.text.source.IAnnotationAccess; -import org.eclipse.jface.text.source.IAnnotationAccessExtension; -import org.eclipse.jface.text.source.IAnnotationModel; -import org.eclipse.jface.text.source.ISourceViewer; -import org.eclipse.jface.text.source.IVerticalRulerInfo; -import org.eclipse.jface.text.source.IVerticalRulerListener; -import org.eclipse.jface.text.source.VerticalRulerEvent; - /** * A control that can display a number of annotations. The control can decide how it layouts the * annotations to present them to the user. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/BestMatchHover.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/BestMatchHover.java index 5c270d99ab1..eae08ba039f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/BestMatchHover.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/BestMatchHover.java @@ -18,6 +18,9 @@ package org.eclipse.cdt.internal.ui.text.c.hover; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.c.hover.ICEditorTextHover; import org.eclipse.jface.text.IInformationControlCreator; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.ITextHover; @@ -27,10 +30,6 @@ import org.eclipse.jface.text.ITextViewer; import org.eclipse.jface.text.information.IInformationProviderExtension2; import org.eclipse.ui.IEditorPart; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.c.hover.ICEditorTextHover; - /** * 'Fake' hover used to choose the best available hover. * This hover is always the first hover used and will delegate the hover diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CDocHover.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CDocHover.java index 825b2057d8f..48e4e034077 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CDocHover.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CDocHover.java @@ -14,26 +14,24 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text.c.hover; -import org.eclipse.core.resources.IProject; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.ITextViewer; -import org.eclipse.jface.text.Region; -import org.eclipse.swt.graphics.Point; -import org.eclipse.ui.IEditorInput; - import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.CHelpProviderManager; +import org.eclipse.cdt.internal.ui.editor.CEditorMessages; +import org.eclipse.cdt.internal.ui.text.CWordFinder; +import org.eclipse.cdt.internal.ui.text.HTMLPrinter; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.IFunctionSummary; import org.eclipse.cdt.ui.IFunctionSummary.IFunctionPrototypeSummary; import org.eclipse.cdt.ui.IRequiredInclude; import org.eclipse.cdt.ui.text.ICHelpInvocationContext; import org.eclipse.cdt.ui.text.IHoverHelpInvocationContext; - -import org.eclipse.cdt.internal.ui.CHelpProviderManager; -import org.eclipse.cdt.internal.ui.editor.CEditorMessages; -import org.eclipse.cdt.internal.ui.text.CWordFinder; -import org.eclipse.cdt.internal.ui.text.HTMLPrinter; +import org.eclipse.core.resources.IProject; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.ITextViewer; +import org.eclipse.jface.text.Region; +import org.eclipse.swt.graphics.Point; +import org.eclipse.ui.IEditorInput; public class CDocHover extends AbstractCEditorTextHover { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverDescriptor.java index 9af653a7760..307be739cad 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverDescriptor.java @@ -14,13 +14,16 @@ package org.eclipse.cdt.internal.ui.text.c.hover; -import com.ibm.icu.text.Collator; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.StringTokenizer; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.c.hover.ICEditorTextHover; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; @@ -31,11 +34,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.swt.SWT; import org.osgi.framework.Bundle; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.c.hover.ICEditorTextHover; - -import org.eclipse.cdt.internal.ui.util.EditorUtility; +import com.ibm.icu.text.Collator; /** * CEditorTexHoverDescriptor diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverProxy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverProxy.java index a32e983c97b..2fe1292afa6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverProxy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverProxy.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text.c.hover; +import org.eclipse.cdt.ui.text.c.hover.ICEditorTextHover; import org.eclipse.jface.text.IInformationControlCreator; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.ITextHoverExtension; @@ -22,8 +23,6 @@ import org.eclipse.jface.text.ITextViewer; import org.eclipse.jface.text.information.IInformationProviderExtension2; import org.eclipse.ui.IEditorPart; -import org.eclipse.cdt.ui.text.c.hover.ICEditorTextHover; - /** * CEditorTexHoverProxy */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CExpandHover.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CExpandHover.java index aa216f46ea6..65120099b08 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CExpandHover.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CExpandHover.java @@ -19,15 +19,14 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.GC; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.graphics.Rectangle; -import org.eclipse.swt.widgets.Canvas; - +import org.eclipse.cdt.internal.ui.editor.CDocumentProvider.ProblemAnnotation; +import org.eclipse.cdt.internal.ui.editor.CMarkerAnnotation; +import org.eclipse.cdt.internal.ui.editor.ICAnnotation; +import org.eclipse.cdt.internal.ui.text.c.hover.AnnotationExpansionControl.AnnotationHoverInput; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.viewers.IDoubleClickListener; - import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IInformationControlExtension2; import org.eclipse.jface.text.Position; @@ -39,19 +38,15 @@ import org.eclipse.jface.text.source.IAnnotationModel; import org.eclipse.jface.text.source.IAnnotationPresentation; import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.jface.text.source.ImageUtilities; - +import org.eclipse.jface.viewers.IDoubleClickListener; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.GC; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.Rectangle; +import org.eclipse.swt.widgets.Canvas; import org.eclipse.ui.texteditor.AnnotationPreference; import org.eclipse.ui.texteditor.AnnotationPreferenceLookup; -import org.eclipse.cdt.ui.PreferenceConstants; - -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.internal.ui.editor.CDocumentProvider.ProblemAnnotation; -import org.eclipse.cdt.internal.ui.editor.ICAnnotation; -import org.eclipse.cdt.internal.ui.editor.CMarkerAnnotation; -import org.eclipse.cdt.internal.ui.text.c.hover.AnnotationExpansionControl.AnnotationHoverInput; - /** * Originally copied from org.eclipse.jdt.internal.ui.text.java.hover.JavaExpandHover * @since 6.1 diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroCompareViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroCompareViewer.java index 325481ea06c..901c779d21c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroCompareViewer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroCompareViewer.java @@ -14,6 +14,8 @@ package org.eclipse.cdt.internal.ui.text.c.hover; +import org.eclipse.cdt.core.dom.rewrite.MacroExpansionExplorer.IMacroExpansionStep; +import org.eclipse.cdt.internal.ui.compare.CMergeViewer; import org.eclipse.compare.CompareConfiguration; import org.eclipse.compare.contentmergeviewer.ITokenComparator; import org.eclipse.compare.rangedifferencer.IRangeComparator; @@ -30,10 +32,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.text.edits.ReplaceEdit; import org.eclipse.ui.texteditor.AbstractTextEditor; -import org.eclipse.cdt.core.dom.rewrite.MacroExpansionExplorer.IMacroExpansionStep; - -import org.eclipse.cdt.internal.ui.compare.CMergeViewer; - /** * A viewer for comparison of macro expansions. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionControl.java index 46e4b2cf93e..9a9de5c568a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionControl.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionControl.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text.c.hover; +import org.eclipse.cdt.internal.ui.text.AbstractSourceViewerInformationControl; import org.eclipse.jface.text.IInformationControl; import org.eclipse.jface.text.IInformationControlCreator; import org.eclipse.osgi.util.NLS; @@ -21,8 +22,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.keys.IBindingService; import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds; -import org.eclipse.cdt.internal.ui.text.AbstractSourceViewerInformationControl; - /** * Information control for macro expansion. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionExplorationControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionExplorationControl.java index e57413e3d35..4e894185ff6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionExplorationControl.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionExplorationControl.java @@ -17,6 +17,19 @@ package org.eclipse.cdt.internal.ui.text.c.hover; import java.util.ArrayList; import java.util.Collection; +import org.eclipse.cdt.core.dom.ast.IASTFileLocation; +import org.eclipse.cdt.core.dom.ast.IMacroBinding; +import org.eclipse.cdt.core.dom.rewrite.MacroExpansionExplorer.IMacroExpansionStep; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.internal.ui.editor.CSourceViewer; +import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds; +import org.eclipse.cdt.internal.ui.text.AbstractCompareViewerInformationControl; +import org.eclipse.cdt.internal.ui.text.CTextTools; +import org.eclipse.cdt.internal.ui.text.SimpleCSourceViewerConfiguration; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.compare.CompareConfiguration; import org.eclipse.compare.ITypedElement; import org.eclipse.compare.Splitter; @@ -70,21 +83,6 @@ import org.eclipse.ui.menus.CommandContributionItem; import org.eclipse.ui.menus.CommandContributionItemParameter; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.core.dom.ast.IASTFileLocation; -import org.eclipse.cdt.core.dom.ast.IMacroBinding; -import org.eclipse.cdt.core.dom.rewrite.MacroExpansionExplorer.IMacroExpansionStep; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.ICPartitions; - -import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.internal.ui.editor.CSourceViewer; -import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds; -import org.eclipse.cdt.internal.ui.text.AbstractCompareViewerInformationControl; -import org.eclipse.cdt.internal.ui.text.CTextTools; -import org.eclipse.cdt.internal.ui.text.SimpleCSourceViewerConfiguration; -import org.eclipse.cdt.internal.ui.util.EditorUtility; - /** * Information control for macro expansion exploration. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionInput.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionInput.java index a8a02d1d6df..1c542160723 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionInput.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionInput.java @@ -18,21 +18,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.core.runtime.Assert; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.ISchedulingRule; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.Position; -import org.eclipse.jface.text.Region; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.texteditor.ITextEditor; - import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IASTMacroExpansionLocation; import org.eclipse.cdt.core.dom.ast.IASTName; @@ -48,13 +33,25 @@ import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.IWorkingCopyManager; - import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; - import org.eclipse.cdt.internal.ui.editor.ASTProvider; import org.eclipse.cdt.internal.ui.text.CHeuristicScanner; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.IWorkingCopyManager; +import org.eclipse.core.runtime.Assert; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.ISchedulingRule; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Position; +import org.eclipse.jface.text.Region; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.texteditor.ITextEditor; /** * An input object to the {@link CMacroExpansionExplorationControl}. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CSourceHover.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CSourceHover.java index 607b5c87554..1e6f9d654fb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CSourceHover.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CSourceHover.java @@ -19,36 +19,6 @@ package org.eclipse.cdt.internal.ui.text.c.hover; import java.io.IOException; import java.util.Set; -import org.eclipse.core.filebuffers.FileBuffers; -import org.eclipse.core.filebuffers.ITextFileBuffer; -import org.eclipse.core.filebuffers.ITextFileBufferManager; -import org.eclipse.core.filebuffers.LocationKind; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.ISchedulingRule; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.Document; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IInformationControl; -import org.eclipse.jface.text.IInformationControlCreator; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.ITextViewer; -import org.eclipse.jface.text.ITypedRegion; -import org.eclipse.jface.text.Region; -import org.eclipse.jface.text.TextUtilities; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.part.IWorkbenchPartOrientation; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.IPositionConverter; import org.eclipse.cdt.core.dom.IName; @@ -96,10 +66,6 @@ import org.eclipse.cdt.core.model.IWorkingCopy; import org.eclipse.cdt.core.parser.KeywordSetKey; import org.eclipse.cdt.core.parser.ParserFactory; import org.eclipse.cdt.core.parser.ParserLanguage; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.IWorkingCopyManager; -import org.eclipse.cdt.ui.text.ICPartitions; - import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPUnknownBinding; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPSemantics; @@ -108,11 +74,42 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.HeuristicResolver; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil; import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; import org.eclipse.cdt.internal.corext.util.Strings; - import org.eclipse.cdt.internal.ui.editor.ASTProvider; import org.eclipse.cdt.internal.ui.text.CCodeReader; import org.eclipse.cdt.internal.ui.text.CHeuristicScanner; import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.IWorkingCopyManager; +import org.eclipse.cdt.ui.text.ICPartitions; +import org.eclipse.core.filebuffers.FileBuffers; +import org.eclipse.core.filebuffers.ITextFileBuffer; +import org.eclipse.core.filebuffers.ITextFileBufferManager; +import org.eclipse.core.filebuffers.LocationKind; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.ISchedulingRule; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.Document; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IInformationControl; +import org.eclipse.jface.text.IInformationControlCreator; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.ITextViewer; +import org.eclipse.jface.text.ITypedRegion; +import org.eclipse.jface.text.Region; +import org.eclipse.jface.text.TextUtilities; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.part.IWorkbenchPartOrientation; /** * A text hover presenting the source of the element under the cursor. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CTypeHover.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CTypeHover.java index 4032bba4961..2510007f02b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CTypeHover.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CTypeHover.java @@ -15,6 +15,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text.c.hover; +import org.eclipse.cdt.ui.text.c.hover.ICEditorTextHover; import org.eclipse.jface.text.IInformationControlCreator; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.ITextHoverExtension; @@ -23,8 +24,6 @@ import org.eclipse.jface.text.ITextViewer; import org.eclipse.jface.text.information.IInformationProviderExtension2; import org.eclipse.ui.IEditorPart; -import org.eclipse.cdt.ui.text.c.hover.ICEditorTextHover; - /** * Aggregator of problem and doc hovers. * @since 5.0 diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/ProblemHover.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/ProblemHover.java index 9a0679f7fe0..7e1f33f21e2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/ProblemHover.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/ProblemHover.java @@ -18,6 +18,17 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.editor.ICAnnotation; +import org.eclipse.cdt.internal.ui.text.contentassist.CCompletionProposalComparator; +import org.eclipse.cdt.internal.ui.text.correction.CCorrectionProcessor; +import org.eclipse.cdt.internal.ui.text.correction.CorrectionContext; +import org.eclipse.cdt.internal.ui.text.correction.ProblemLocation; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.ICCompletionProposal; +import org.eclipse.cdt.ui.text.IProblemLocation; import org.eclipse.core.resources.IMarker; import org.eclipse.jface.text.ITextViewer; import org.eclipse.jface.text.Position; @@ -29,19 +40,6 @@ import org.eclipse.ui.IEditorInput; import org.eclipse.ui.texteditor.MarkerAnnotation; import org.eclipse.ui.texteditor.spelling.SpellingAnnotation; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.ICCompletionProposal; -import org.eclipse.cdt.ui.text.IProblemLocation; - -import org.eclipse.cdt.internal.ui.editor.ICAnnotation; -import org.eclipse.cdt.internal.ui.text.contentassist.CCompletionProposalComparator; -import org.eclipse.cdt.internal.ui.text.correction.CCorrectionProcessor; -import org.eclipse.cdt.internal.ui.text.correction.CorrectionContext; -import org.eclipse.cdt.internal.ui.text.correction.ProblemLocation; -import org.eclipse.cdt.internal.ui.util.EditorUtility; - /** * This annotation hover shows the description of the * selected java annotation. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/SourceViewerInformationControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/SourceViewerInformationControl.java index 94714b9fec0..4e6d2b66f4e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/SourceViewerInformationControl.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/SourceViewerInformationControl.java @@ -15,6 +15,14 @@ package org.eclipse.cdt.internal.ui.text.c.hover; +import org.eclipse.cdt.internal.ui.editor.CSourceViewer; +import org.eclipse.cdt.internal.ui.text.CTextTools; +import org.eclipse.cdt.internal.ui.text.SimpleCSourceViewerConfiguration; +import org.eclipse.cdt.ui.CDTUITools; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.ICColorConstants; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferenceConverter; @@ -51,16 +59,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.texteditor.AbstractTextEditor; -import org.eclipse.cdt.ui.CDTUITools; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.ICColorConstants; -import org.eclipse.cdt.ui.text.ICPartitions; - -import org.eclipse.cdt.internal.ui.editor.CSourceViewer; -import org.eclipse.cdt.internal.ui.text.CTextTools; -import org.eclipse.cdt.internal.ui.text.SimpleCSourceViewerConfiguration; - /** * Source viewer based implementation of <code>IInformationControl</code>. * Displays information in a source viewer. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposal.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposal.java index 11082d8d419..f2cdc53d89c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposal.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposal.java @@ -14,6 +14,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text.contentassist; +import org.eclipse.cdt.internal.core.parser.util.ContentAssistMatcherFactory; +import org.eclipse.cdt.internal.ui.text.CTextTools; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.ICCompletionProposal; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferenceConverter; @@ -51,13 +55,6 @@ import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.RGB; import org.eclipse.ui.texteditor.link.EditorLinkedModeUI; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.ICCompletionProposal; - -import org.eclipse.cdt.internal.core.parser.util.ContentAssistMatcherFactory; - -import org.eclipse.cdt.internal.ui.text.CTextTools; - public class CCompletionProposal implements ICCompletionProposal, ICompletionProposalExtension, ICompletionProposalExtension2, ICompletionProposalExtension3 { private String fDisplayString; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistInvocationContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistInvocationContext.java index 551b6375717..50f0609adcc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistInvocationContext.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistInvocationContext.java @@ -19,13 +19,6 @@ package org.eclipse.cdt.internal.ui.text.contentassist; import java.util.Map; -import org.eclipse.core.runtime.Assert; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.ITextViewer; -import org.eclipse.ui.IEditorPart; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.ast.ASTCompletionNode; import org.eclipse.cdt.core.dom.ast.ExpansionOverlapsBoundaryException; @@ -46,14 +39,19 @@ import org.eclipse.cdt.core.index.IIndexManager; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.parser.IToken; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.text.CHeuristicScanner; +import org.eclipse.cdt.internal.ui.text.Symbols; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.cdt.ui.text.contentassist.ContentAssistInvocationContext; import org.eclipse.cdt.ui.text.contentassist.ICEditorContentAssistInvocationContext; - -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.text.CHeuristicScanner; -import org.eclipse.cdt.internal.ui.text.Symbols; +import org.eclipse.core.runtime.Assert; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.ITextViewer; +import org.eclipse.ui.IEditorPart; /** * Describes the context of a content assist invocation in a C/C++ editor. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistProcessor.java index 0128ec5e0a9..281a1154fb1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistProcessor.java @@ -21,41 +21,38 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.InvalidRegistryObjectException; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.ITextViewer; -import org.eclipse.jface.text.contentassist.ContentAssistant; -import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jface.text.contentassist.IContextInformation; -import org.eclipse.jface.text.contentassist.IContextInformationValidator; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.graphics.Point; -import org.eclipse.ui.IEditorPart; - import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; import org.eclipse.cdt.core.dom.ast.IASTExpression; import org.eclipse.cdt.core.dom.ast.IASTFieldReference; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IPointerType; import org.eclipse.cdt.core.dom.ast.IType; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.ICCompletionProposal; -import org.eclipse.cdt.ui.text.contentassist.ContentAssistInvocationContext; -import org.eclipse.cdt.ui.text.contentassist.IProposalFilter; - import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPUnknownType; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPSemantics; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.HeuristicResolver; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil; - import org.eclipse.cdt.internal.ui.preferences.ProposalFilterPreferencesUtil; import org.eclipse.cdt.internal.ui.text.CHeuristicScanner; import org.eclipse.cdt.internal.ui.text.CParameterListValidator; import org.eclipse.cdt.internal.ui.text.Symbols; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.ICCompletionProposal; +import org.eclipse.cdt.ui.text.contentassist.ContentAssistInvocationContext; +import org.eclipse.cdt.ui.text.contentassist.IProposalFilter; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.InvalidRegistryObjectException; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.ITextViewer; +import org.eclipse.jface.text.contentassist.ContentAssistant; +import org.eclipse.jface.text.contentassist.ICompletionProposal; +import org.eclipse.jface.text.contentassist.IContextInformation; +import org.eclipse.jface.text.contentassist.IContextInformationValidator; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.Point; +import org.eclipse.ui.IEditorPart; /** * C/C++ content assist processor. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionProposalCategory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionProposalCategory.java index d488d7ffa58..dba12554b74 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionProposalCategory.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionProposalCategory.java @@ -18,6 +18,10 @@ import java.net.URL; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.internal.ui.util.Messages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.contentassist.ContentAssistInvocationContext; +import org.eclipse.cdt.ui.text.contentassist.ICompletionProposalComputer; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IConfigurationElement; @@ -33,12 +37,6 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContextInformation; import org.osgi.framework.Bundle; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.contentassist.ContentAssistInvocationContext; -import org.eclipse.cdt.ui.text.contentassist.ICompletionProposalComputer; - -import org.eclipse.cdt.internal.ui.util.Messages; - /** * Describes a category extension to the "completionProposalComputer" extension point. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionProposalComputerDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionProposalComputerDescriptor.java index 7cb481d35a7..9eaa7ddc221 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionProposalComputerDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionProposalComputerDescriptor.java @@ -20,6 +20,12 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.eclipse.cdt.internal.ui.util.Messages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.ICPartitions; +import org.eclipse.cdt.ui.text.contentassist.ContentAssistInvocationContext; +import org.eclipse.cdt.ui.text.contentassist.ICompletionProposalComputer; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; @@ -36,14 +42,6 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContextInformation; import org.osgi.framework.Bundle; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.ICPartitions; -import org.eclipse.cdt.ui.text.contentassist.ContentAssistInvocationContext; -import org.eclipse.cdt.ui.text.contentassist.ICompletionProposalComputer; - -import org.eclipse.cdt.internal.ui.util.Messages; - /** * The description of an extension to the * <code>org.eclipse.cdt.ui.completionProposalComputer</code> extension point. Instances are diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionProposalComputerRegistry.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionProposalComputerRegistry.java index ce6a56e1636..268639f0f3d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionProposalComputerRegistry.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionProposalComputerRegistry.java @@ -26,6 +26,9 @@ import java.util.Map; import java.util.Set; import java.util.StringTokenizer; +import org.eclipse.cdt.internal.ui.util.Messages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IContributor; @@ -45,11 +48,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Link; import org.eclipse.ui.dialogs.PreferencesUtil; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; - -import org.eclipse.cdt.internal.ui.util.Messages; - /** * A registry for all extensions to the * <code>org.eclipse.cdt.ui.completionProposalComputer</code> diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistHandler.java index b3b2d15b833..0b9c1767b76 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistHandler.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistHandler.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text.contentassist; +import org.eclipse.cdt.internal.ui.editor.SpecificContentAssistExecutor; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; @@ -23,8 +24,6 @@ import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.internal.ui.editor.SpecificContentAssistExecutor; - /** * A command handler to invoke a content assist for a specific proposal category. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistPreference.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistPreference.java index c157e9e0448..9e229aa5743 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistPreference.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistPreference.java @@ -17,6 +17,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text.contentassist; +import org.eclipse.cdt.internal.core.parser.util.ContentAssistMatcherFactory; +import org.eclipse.cdt.internal.ui.text.CTextTools; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.IColorManager; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.jface.text.IDocument; @@ -27,14 +32,6 @@ import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.RGB; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.IColorManager; - -import org.eclipse.cdt.internal.core.parser.util.ContentAssistMatcherFactory; - -import org.eclipse.cdt.internal.ui.text.CTextTools; - public class ContentAssistPreference { // /** Preference key for content assist auto activation (unused) */ // public final static String AUTOACTIVATION= "content_assist_autoactivation"; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistProcessor.java index 59960d28cfc..f21a081ec23 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistProcessor.java @@ -22,6 +22,11 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import org.eclipse.cdt.internal.ui.dialogs.OptionalMessageDialog; +import org.eclipse.cdt.internal.ui.util.Messages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.contentassist.ContentAssistInvocationContext; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; @@ -60,13 +65,6 @@ import org.eclipse.ui.dialogs.PreferencesUtil; import org.eclipse.ui.keys.IBindingService; import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.contentassist.ContentAssistInvocationContext; - -import org.eclipse.cdt.internal.ui.dialogs.OptionalMessageDialog; -import org.eclipse.cdt.internal.ui.util.Messages; - /** * A content assist processor that aggregates the proposals of the * {@link org.eclipse.cdt.ui.text.contentassist.ICompletionProposalComputer}s contributed via diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionProposalComputer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionProposalComputer.java index d744d1cdbc0..05971ede82a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionProposalComputer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionProposalComputer.java @@ -29,15 +29,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.ITypedRegion; -import org.eclipse.jface.text.TextUtilities; -import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.swt.graphics.Image; - import org.eclipse.cdt.core.dom.ILinkage; import org.eclipse.cdt.core.dom.ast.ASTCompletionNode; import org.eclipse.cdt.core.dom.ast.ASTTypeUtil; @@ -97,9 +88,6 @@ import org.eclipse.cdt.core.parser.IToken; import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; import org.eclipse.cdt.core.parser.util.CharArrayUtils; import org.eclipse.cdt.core.parser.util.IContentAssistMatcher; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.ICPartitions; - import org.eclipse.cdt.internal.core.dom.parser.ASTNode; import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; import org.eclipse.cdt.internal.core.dom.parser.IASTInactiveCompletionName; @@ -119,8 +107,17 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.AccessContext; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPSemantics; import org.eclipse.cdt.internal.core.parser.scanner.TokenWithImage; import org.eclipse.cdt.internal.core.parser.util.ContentAssistMatcherFactory; - import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.ICPartitions; +import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.ITypedRegion; +import org.eclipse.jface.text.TextUtilities; +import org.eclipse.jface.text.contentassist.ICompletionProposal; +import org.eclipse.swt.graphics.Image; /** * Searches the DOM (both the AST and the index) for completion proposals. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/FunctionCompletionProposal.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/FunctionCompletionProposal.java index cac46408981..e98755527d5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/FunctionCompletionProposal.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/FunctionCompletionProposal.java @@ -15,6 +15,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text.contentassist; +import org.eclipse.cdt.core.dom.ast.IFunction; +import org.eclipse.cdt.core.dom.ast.IParameter; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.ITextViewer; @@ -29,11 +33,6 @@ import org.eclipse.swt.events.VerifyEvent; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.texteditor.link.EditorLinkedModeUI; -import org.eclipse.cdt.core.dom.ast.IFunction; -import org.eclipse.cdt.core.dom.ast.IParameter; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; - /** * This is a modified version of org.eclipse.jdt.internal.ui.text.java.JavaMethodCompletionProposal * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/HelpCompletionProposalComputer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/HelpCompletionProposalComputer.java index dc9bab66990..aeb25719866 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/HelpCompletionProposalComputer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/HelpCompletionProposalComputer.java @@ -18,24 +18,21 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.swt.graphics.Image; - import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; import org.eclipse.cdt.core.dom.ast.IASTFieldReference; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.core.dom.parser.IASTInactiveCompletionName; +import org.eclipse.cdt.internal.ui.CHelpProviderManager; +import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.IFunctionSummary; import org.eclipse.cdt.ui.text.ICHelpInvocationContext; import org.eclipse.cdt.ui.text.IContentAssistHelpInvocationContext; - -import org.eclipse.cdt.internal.core.dom.parser.IASTInactiveCompletionName; - -import org.eclipse.cdt.internal.ui.CHelpProviderManager; -import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.text.contentassist.ICompletionProposal; +import org.eclipse.swt.graphics.Image; public class HelpCompletionProposalComputer extends ParsingBasedProposalComputer { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/HippieProposalComputer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/HippieProposalComputer.java index f2f945a5759..f695469ffb7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/HippieProposalComputer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/HippieProposalComputer.java @@ -17,14 +17,13 @@ package org.eclipse.cdt.internal.ui.text.contentassist; import java.util.Arrays; import java.util.List; +import org.eclipse.cdt.ui.text.contentassist.ContentAssistInvocationContext; +import org.eclipse.cdt.ui.text.contentassist.ICompletionProposalComputer; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContextInformation; import org.eclipse.ui.texteditor.HippieProposalProcessor; -import org.eclipse.cdt.ui.text.contentassist.ContentAssistInvocationContext; -import org.eclipse.cdt.ui.text.contentassist.ICompletionProposalComputer; - /** * A computer wrapper for the hippie processor. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/InclusionProposalComputer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/InclusionProposalComputer.java index 8b2088c6e09..c4867ebaeb5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/InclusionProposalComputer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/InclusionProposalComputer.java @@ -21,6 +21,18 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.IInclude; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.parser.IExtendedScannerInfo; +import org.eclipse.cdt.core.parser.IScannerInfo; +import org.eclipse.cdt.core.parser.util.IContentAssistMatcher; +import org.eclipse.cdt.internal.core.parser.util.ContentAssistMatcherFactory; +import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.ICPartitions; +import org.eclipse.cdt.ui.text.contentassist.ContentAssistInvocationContext; +import org.eclipse.cdt.ui.text.contentassist.ICompletionProposalComputer; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -40,21 +52,6 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContextInformation; import org.eclipse.swt.graphics.Image; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.IInclude; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.parser.IExtendedScannerInfo; -import org.eclipse.cdt.core.parser.IScannerInfo; -import org.eclipse.cdt.core.parser.util.IContentAssistMatcher; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.ICPartitions; -import org.eclipse.cdt.ui.text.contentassist.ContentAssistInvocationContext; -import org.eclipse.cdt.ui.text.contentassist.ICompletionProposalComputer; - -import org.eclipse.cdt.internal.core.parser.util.ContentAssistMatcherFactory; - -import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; - /** * A proposal computer for include directives. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/KeywordCompletionProposalComputer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/KeywordCompletionProposalComputer.java index 20b9f51ba6c..c153fd1d8d6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/KeywordCompletionProposalComputer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/KeywordCompletionProposalComputer.java @@ -18,25 +18,23 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.ITypedRegion; -import org.eclipse.jface.text.TextUtilities; -import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.swt.graphics.Image; - import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; import org.eclipse.cdt.core.dom.ast.IASTFieldReference; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.model.ICLanguageKeywords; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.text.ICPartitions; - -import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.ITypedRegion; +import org.eclipse.jface.text.TextUtilities; +import org.eclipse.jface.text.contentassist.ICompletionProposal; +import org.eclipse.swt.graphics.Image; public class KeywordCompletionProposalComputer extends ParsingBasedProposalComputer { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ParameterGuesser.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ParameterGuesser.java index f6707458269..fbf2a093db9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ParameterGuesser.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ParameterGuesser.java @@ -22,11 +22,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.text.Position; -import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.swt.graphics.Image; - import org.eclipse.cdt.core.dom.ast.DOMException; import org.eclipse.cdt.core.dom.ast.IASTExpression.ValueCategory; import org.eclipse.cdt.core.dom.ast.IBinding; @@ -53,14 +48,16 @@ import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.IField; import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; import org.eclipse.cdt.core.parser.util.CharArrayUtils; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.Conversions; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.Conversions.Context; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.Conversions.UDCMode; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.Cost; - import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.text.Position; +import org.eclipse.jface.text.contentassist.ICompletionProposal; +import org.eclipse.swt.graphics.Image; /** * This class is based on org.eclipse.jdt.internal.ui.text.java.ParameterGuesser diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ParameterGuessingProposal.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ParameterGuessingProposal.java index 2d3815d5547..a7a14dc176b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ParameterGuessingProposal.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ParameterGuessingProposal.java @@ -20,6 +20,21 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.dom.ast.IBinding; +import org.eclipse.cdt.core.dom.ast.IFunction; +import org.eclipse.cdt.core.dom.ast.IParameter; +import org.eclipse.cdt.core.dom.ast.IType; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPSemantics; +import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; +import org.eclipse.cdt.internal.ui.editor.ASTProvider; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.editor.EditorHighlightingSynchronizer; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; @@ -48,24 +63,6 @@ import org.eclipse.swt.graphics.Point; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.texteditor.link.EditorLinkedModeUI; -import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; -import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.ast.IBinding; -import org.eclipse.cdt.core.dom.ast.IFunction; -import org.eclipse.cdt.core.dom.ast.IParameter; -import org.eclipse.cdt.core.dom.ast.IType; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPSemantics; -import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; - -import org.eclipse.cdt.internal.ui.editor.ASTProvider; -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.editor.EditorHighlightingSynchronizer; - /** * This class is based on org.eclipse.jdt.internal.ui.text.java.ParameterGuessingProposal * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ParsingBasedProposalComputer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ParsingBasedProposalComputer.java index 8209134f32d..2c5a6fa02e2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ParsingBasedProposalComputer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ParsingBasedProposalComputer.java @@ -20,15 +20,14 @@ import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jface.text.contentassist.IContextInformation; - import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.text.contentassist.ContentAssistInvocationContext; import org.eclipse.cdt.ui.text.contentassist.ICompletionProposalComputer; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.jface.text.contentassist.ICompletionProposal; +import org.eclipse.jface.text.contentassist.IContextInformation; /** * The base class for any proposal computers that require a completion node in diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/TemplateCompletionProposalComputer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/TemplateCompletionProposalComputer.java index 2f057fbf330..2e53789edc3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/TemplateCompletionProposalComputer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/TemplateCompletionProposalComputer.java @@ -17,6 +17,16 @@ package org.eclipse.cdt.internal.ui.text.contentassist; import java.util.Collections; import java.util.List; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.corext.template.c.CContextType; +import org.eclipse.cdt.internal.corext.template.c.CommentContextType; +import org.eclipse.cdt.internal.corext.template.c.DocCommentContextType; +import org.eclipse.cdt.internal.ui.text.CHeuristicScanner; +import org.eclipse.cdt.internal.ui.text.template.TemplateEngine; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.ICPartitions; +import org.eclipse.cdt.ui.text.contentassist.ContentAssistInvocationContext; +import org.eclipse.cdt.ui.text.contentassist.ICompletionProposalComputer; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.ITextViewer; @@ -25,19 +35,6 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContextInformation; import org.eclipse.jface.text.templates.TemplateContextType; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.ICPartitions; -import org.eclipse.cdt.ui.text.contentassist.ContentAssistInvocationContext; -import org.eclipse.cdt.ui.text.contentassist.ICompletionProposalComputer; - -import org.eclipse.cdt.internal.corext.template.c.CContextType; -import org.eclipse.cdt.internal.corext.template.c.CommentContextType; -import org.eclipse.cdt.internal.corext.template.c.DocCommentContextType; - -import org.eclipse.cdt.internal.ui.text.CHeuristicScanner; -import org.eclipse.cdt.internal.ui.text.template.TemplateEngine; - /** * A completion proposal computer for templates. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CCorrectionAssistant.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CCorrectionAssistant.java index 7e1d8d4e0a7..bec6504b00a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CCorrectionAssistant.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CCorrectionAssistant.java @@ -19,6 +19,16 @@ package org.eclipse.cdt.internal.ui.text.correction; import java.util.ArrayList; import java.util.Iterator; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.core.model.ASTCache; +import org.eclipse.cdt.internal.ui.editor.ASTProvider; +import org.eclipse.cdt.internal.ui.text.CTextTools; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.IColorManager; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -47,19 +57,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.texteditor.IDocumentProvider; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.IColorManager; - -import org.eclipse.cdt.internal.core.model.ASTCache; - -import org.eclipse.cdt.internal.ui.editor.ASTProvider; -import org.eclipse.cdt.internal.ui.text.CTextTools; - public class CCorrectionAssistant extends QuickAssistAssistant { private ITextViewer fViewer; private ITextEditor fEditor; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CCorrectionProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CCorrectionProcessor.java index 0342e7d2f63..09a058afb0f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CCorrectionProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CCorrectionProcessor.java @@ -20,6 +20,16 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.editor.ICAnnotation; +import org.eclipse.cdt.internal.ui.text.contentassist.CCompletionProposalComparator; +import org.eclipse.cdt.internal.ui.text.correction.proposals.ChangeCorrectionProposal; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.ICCompletionProposal; +import org.eclipse.cdt.ui.text.IInvocationContext; +import org.eclipse.cdt.ui.text.IProblemLocation; +import org.eclipse.cdt.ui.text.IQuickAssistProcessor; +import org.eclipse.cdt.ui.text.IQuickFixProcessor; import org.eclipse.core.resources.IMarker; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.ISafeRunnable; @@ -43,18 +53,6 @@ import org.eclipse.ui.IMarkerResolution; import org.eclipse.ui.ide.IDE; import org.eclipse.ui.texteditor.SimpleMarkerAnnotation; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.ICCompletionProposal; -import org.eclipse.cdt.ui.text.IInvocationContext; -import org.eclipse.cdt.ui.text.IProblemLocation; -import org.eclipse.cdt.ui.text.IQuickAssistProcessor; -import org.eclipse.cdt.ui.text.IQuickFixProcessor; - -import org.eclipse.cdt.internal.ui.editor.ICAnnotation; -import org.eclipse.cdt.internal.ui.text.contentassist.CCompletionProposalComparator; -import org.eclipse.cdt.internal.ui.text.correction.proposals.ChangeCorrectionProposal; - public class CCorrectionProcessor implements org.eclipse.jface.text.quickassist.IQuickAssistProcessor { private static final String QUICKFIX_PROCESSOR_CONTRIBUTION_ID = "quickFixProcessors"; //$NON-NLS-1$ private static final String QUICKASSIST_PROCESSOR_CONTRIBUTION_ID = "quickAssistProcessors"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CSelectAnnotationRulerAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CSelectAnnotationRulerAction.java index b9693fef977..40c44382dc9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CSelectAnnotationRulerAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CSelectAnnotationRulerAction.java @@ -19,6 +19,8 @@ import java.util.Iterator; import java.util.ResourceBundle; import java.util.TreeMap; +import org.eclipse.cdt.internal.ui.editor.OverrideIndicatorManager; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.ITextOperationTarget; @@ -36,10 +38,6 @@ import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.ITextEditorExtension; import org.eclipse.ui.texteditor.SelectMarkerRulerAction; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.editor.OverrideIndicatorManager; - /** * Action which gets triggered when selecting (annotations) in the vertical ruler. * based upon org.eclipse.jdt.internal.ui.javaeditor.JavaSelectMarkerRulerAction diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CSelectRulerAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CSelectRulerAction.java index 2b11b9a083a..2dbd1e2421c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CSelectRulerAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CSelectRulerAction.java @@ -14,13 +14,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text.correction; +import org.eclipse.cdt.internal.ui.editor.ConstructedCEditorMessages; import org.eclipse.jface.action.IAction; import org.eclipse.jface.text.source.IVerticalRulerInfo; import org.eclipse.ui.texteditor.AbstractRulerActionDelegate; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.internal.ui.editor.ConstructedCEditorMessages; - public class CSelectRulerAction extends AbstractRulerActionDelegate { /* diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/ContributedProcessorDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/ContributedProcessorDescriptor.java index a8d65fb53d4..26be1a8fbeb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/ContributedProcessorDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/ContributedProcessorDescriptor.java @@ -18,6 +18,11 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; +import org.eclipse.cdt.core.model.ICModelMarker; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.expressions.EvaluationContext; import org.eclipse.core.expressions.EvaluationResult; import org.eclipse.core.expressions.Expression; @@ -27,13 +32,6 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IStatus; -import org.eclipse.cdt.core.model.ICModelMarker; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; - public final class ContributedProcessorDescriptor { private final IConfigurationElement fConfigurationElement; private Object fProcessorInstance; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandHandler.java index ffb512ae4e0..29c2c4d133c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandHandler.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandHandler.java @@ -18,6 +18,20 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; +import org.eclipse.cdt.core.dom.ast.IASTName; +import org.eclipse.cdt.core.dom.ast.IASTNodeSelector; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.dom.ast.IBinding; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; +import org.eclipse.cdt.internal.ui.actions.ActionUtil; +import org.eclipse.cdt.internal.ui.editor.ASTProvider; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.text.correction.proposals.LinkedNamesAssistProposal; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.ICCompletionProposal; +import org.eclipse.cdt.ui.text.IInvocationContext; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; @@ -39,23 +53,6 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.keys.IBindingService; -import org.eclipse.cdt.core.dom.ast.IASTName; -import org.eclipse.cdt.core.dom.ast.IASTNodeSelector; -import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.ast.IBinding; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.ICCompletionProposal; -import org.eclipse.cdt.ui.text.IInvocationContext; - -import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; - -import org.eclipse.cdt.internal.ui.actions.ActionUtil; -import org.eclipse.cdt.internal.ui.editor.ASTProvider; -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.text.correction.proposals.LinkedNamesAssistProposal; - /** * Handler to be used to run a quick fix or assist by keyboard shortcut */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandInstaller.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandInstaller.java index 22f6cff1c68..ec7361a3e7d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandInstaller.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandInstaller.java @@ -19,6 +19,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.LegacyHandlerSubmissionExpression; import org.eclipse.ui.PlatformUI; @@ -26,10 +28,6 @@ import org.eclipse.ui.commands.ICommandService; import org.eclipse.ui.handlers.IHandlerActivation; import org.eclipse.ui.handlers.IHandlerService; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.editor.CEditor; - public class CorrectionCommandInstaller { /** * All correction commands must start with the following prefix. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionContext.java index 2b77a572068..c16a16f68da 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionContext.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionContext.java @@ -14,11 +14,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text.correction; -import org.eclipse.jface.text.source.ISourceViewer; -import org.eclipse.jface.text.source.TextInvocationContext; - import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.ui.text.IInvocationContext; +import org.eclipse.jface.text.source.ISourceViewer; +import org.eclipse.jface.text.source.TextInvocationContext; public class CorrectionContext extends TextInvocationContext implements IInvocationContext { private ITranslationUnit fTranslationUnit; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/MarkerResolutionProposal.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/MarkerResolutionProposal.java index 6710abb837c..216f22f3b12 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/MarkerResolutionProposal.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/MarkerResolutionProposal.java @@ -14,6 +14,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text.correction; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.ICCompletionProposal; import org.eclipse.core.resources.IMarker; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.text.IDocument; @@ -24,10 +27,6 @@ import org.eclipse.swt.graphics.Point; import org.eclipse.ui.IMarkerResolution; import org.eclipse.ui.IMarkerResolution2; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.ICCompletionProposal; - public class MarkerResolutionProposal implements ICCompletionProposal { private IMarkerResolution fResolution; private IMarker fMarker; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/ProblemLocation.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/ProblemLocation.java index 97b18ffd644..30b75c99c0b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/ProblemLocation.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/ProblemLocation.java @@ -17,10 +17,9 @@ package org.eclipse.cdt.internal.ui.text.correction; import org.eclipse.cdt.core.model.ICModelMarker; import org.eclipse.cdt.core.parser.IPersistableProblem; import org.eclipse.cdt.core.parser.IProblem; -import org.eclipse.cdt.ui.text.IProblemLocation; - import org.eclipse.cdt.internal.ui.editor.CMarkerAnnotation; import org.eclipse.cdt.internal.ui.editor.ICAnnotation; +import org.eclipse.cdt.ui.text.IProblemLocation; public class ProblemLocation implements IProblemLocation { private final int fId; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/QuickAssistLightBulbUpdater.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/QuickAssistLightBulbUpdater.java index 590d612cd58..325ebfa29af 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/QuickAssistLightBulbUpdater.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/QuickAssistLightBulbUpdater.java @@ -17,6 +17,19 @@ package org.eclipse.cdt.internal.ui.text.correction; import java.util.ConcurrentModificationException; import java.util.Iterator; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; +import org.eclipse.cdt.internal.ui.editor.ASTProvider; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.internal.ui.viewsupport.ISelectionListenerWithAST; +import org.eclipse.cdt.internal.ui.viewsupport.SelectionListenerWithASTManager; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.text.BadLocationException; @@ -42,22 +55,6 @@ import org.eclipse.ui.editors.text.EditorsUI; import org.eclipse.ui.texteditor.AnnotationPreference; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; - -import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; - -import org.eclipse.cdt.internal.ui.editor.ASTProvider; -import org.eclipse.cdt.internal.ui.util.EditorUtility; -import org.eclipse.cdt.internal.ui.viewsupport.ISelectionListenerWithAST; -import org.eclipse.cdt.internal.ui.viewsupport.SelectionListenerWithASTManager; - /** * */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/QuickAssistProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/QuickAssistProcessor.java index 3222f765c82..d2c3605c556 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/QuickAssistProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/QuickAssistProcessor.java @@ -19,29 +19,26 @@ package org.eclipse.cdt.internal.ui.text.correction; import java.util.ArrayList; import java.util.Collection; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Status; -import org.eclipse.ui.IEditorPart; - import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTNodeSelector; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.ICCompletionProposal; -import org.eclipse.cdt.ui.text.IInvocationContext; -import org.eclipse.cdt.ui.text.IProblemLocation; -import org.eclipse.cdt.ui.text.IQuickAssistProcessor; - import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; - import org.eclipse.cdt.internal.ui.editor.ASTProvider; import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.cdt.internal.ui.text.correction.proposals.LinkedNamesAssistProposal; import org.eclipse.cdt.internal.ui.text.correction.proposals.RenameRefactoringProposal; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.ICCompletionProposal; +import org.eclipse.cdt.ui.text.IInvocationContext; +import org.eclipse.cdt.ui.text.IProblemLocation; +import org.eclipse.cdt.ui.text.IQuickAssistProcessor; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Status; +import org.eclipse.ui.IEditorPart; /** * see org.eclipse.cdt.ui.text.IQuickAssistProcessor diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/ASTRewriteCorrectionProposal.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/ASTRewriteCorrectionProposal.java index 816717612c3..e786a6d88fa 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/ASTRewriteCorrectionProposal.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/ASTRewriteCorrectionProposal.java @@ -14,6 +14,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text.correction.proposals; +import org.eclipse.cdt.core.dom.rewrite.ASTRewrite; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.CUIStatus; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.text.IDocument; @@ -23,11 +26,6 @@ import org.eclipse.ltk.core.refactoring.TextChange; import org.eclipse.swt.graphics.Image; import org.eclipse.text.edits.TextEdit; -import org.eclipse.cdt.core.dom.rewrite.ASTRewrite; -import org.eclipse.cdt.core.model.ITranslationUnit; - -import org.eclipse.cdt.internal.ui.CUIStatus; - /** * A proposal for quick fixes and quick assists that works on a AST rewriter. * Either a rewriter is directly passed in the constructor or method {@link #getRewrite()} diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/ChangeCorrectionProposal.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/ChangeCorrectionProposal.java index 15b4599a55b..1a1ec441064 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/ChangeCorrectionProposal.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/ChangeCorrectionProposal.java @@ -15,6 +15,13 @@ package org.eclipse.cdt.internal.ui.text.correction.proposals; +import org.eclipse.cdt.internal.ui.text.correction.CorrectionCommandHandler; +import org.eclipse.cdt.internal.ui.text.correction.CorrectionMessages; +import org.eclipse.cdt.internal.ui.text.correction.ICommandAccess; +import org.eclipse.cdt.internal.ui.util.ExceptionHandler; +import org.eclipse.cdt.internal.ui.viewsupport.ColoringLabelProvider; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.ICCompletionProposal; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; @@ -36,15 +43,6 @@ import org.eclipse.ui.IEditorPart; import com.ibm.icu.text.MessageFormat; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.ICCompletionProposal; - -import org.eclipse.cdt.internal.ui.text.correction.CorrectionCommandHandler; -import org.eclipse.cdt.internal.ui.text.correction.CorrectionMessages; -import org.eclipse.cdt.internal.ui.text.correction.ICommandAccess; -import org.eclipse.cdt.internal.ui.util.ExceptionHandler; -import org.eclipse.cdt.internal.ui.viewsupport.ColoringLabelProvider; - /** * Implementation of a C completion proposal to be used for quick fix and quick assist * proposals that invoke a {@link Change}. The proposal offers a proposal information but no context diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/LinkedCorrectionProposal.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/LinkedCorrectionProposal.java index a30eed5d53f..3c640f92db7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/LinkedCorrectionProposal.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/LinkedCorrectionProposal.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text.correction.proposals; -import org.eclipse.swt.graphics.Image; - import org.eclipse.cdt.core.dom.rewrite.ASTRewrite; import org.eclipse.cdt.core.dom.rewrite.ITrackedNodePosition; import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.swt.graphics.Image; /** * A proposal for quick fixes and quick assists that works on a AST rewriter and enters the diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/LinkedNamesAssistProposal.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/LinkedNamesAssistProposal.java index dac5a747427..1dbddb5b05a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/LinkedNamesAssistProposal.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/LinkedNamesAssistProposal.java @@ -17,6 +17,23 @@ package org.eclipse.cdt.internal.ui.text.correction.proposals; import java.util.Arrays; import java.util.Comparator; +import org.eclipse.cdt.core.dom.ast.IASTName; +import org.eclipse.cdt.core.dom.ast.IASTNodeSelector; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; +import org.eclipse.cdt.internal.ui.editor.ASTProvider; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.editor.EditorHighlightingSynchronizer; +import org.eclipse.cdt.internal.ui.search.LinkedNamesFinder; +import org.eclipse.cdt.internal.ui.text.correction.CorrectionCommandHandler; +import org.eclipse.cdt.internal.ui.text.correction.CorrectionMessages; +import org.eclipse.cdt.internal.ui.text.correction.ICommandAccess; +import org.eclipse.cdt.internal.ui.viewsupport.ColoringLabelProvider; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.ICCompletionProposal; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; @@ -44,26 +61,6 @@ import org.eclipse.swt.graphics.Point; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.texteditor.link.EditorLinkedModeUI; -import org.eclipse.cdt.core.dom.ast.IASTName; -import org.eclipse.cdt.core.dom.ast.IASTNodeSelector; -import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.ICCompletionProposal; - -import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; - -import org.eclipse.cdt.internal.ui.editor.ASTProvider; -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.editor.EditorHighlightingSynchronizer; -import org.eclipse.cdt.internal.ui.search.LinkedNamesFinder; -import org.eclipse.cdt.internal.ui.text.correction.CorrectionCommandHandler; -import org.eclipse.cdt.internal.ui.text.correction.CorrectionMessages; -import org.eclipse.cdt.internal.ui.text.correction.ICommandAccess; -import org.eclipse.cdt.internal.ui.viewsupport.ColoringLabelProvider; - /** * A proposal allowing user to edit in place all occurrences of a name. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/RenameRefactoringProposal.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/RenameRefactoringProposal.java index 901a61f3666..2cef9f34f18 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/RenameRefactoringProposal.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/RenameRefactoringProposal.java @@ -14,6 +14,15 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text.correction.proposals; +import org.eclipse.cdt.internal.corext.util.Messages; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds; +import org.eclipse.cdt.internal.ui.text.correction.CorrectionCommandHandler; +import org.eclipse.cdt.internal.ui.text.correction.CorrectionMessages; +import org.eclipse.cdt.internal.ui.text.correction.ICommandAccess; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.refactoring.actions.CRenameAction; +import org.eclipse.cdt.ui.text.ICCompletionProposal; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.contentassist.ICompletionProposalExtension6; import org.eclipse.jface.text.contentassist.IContextInformation; @@ -22,18 +31,6 @@ import org.eclipse.jface.viewers.StyledString; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.refactoring.actions.CRenameAction; -import org.eclipse.cdt.ui.text.ICCompletionProposal; - -import org.eclipse.cdt.internal.corext.util.Messages; - -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds; -import org.eclipse.cdt.internal.ui.text.correction.CorrectionCommandHandler; -import org.eclipse.cdt.internal.ui.text.correction.CorrectionMessages; -import org.eclipse.cdt.internal.ui.text.correction.ICommandAccess; - /** * A quick assist proposal that starts the Rename refactoring. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/TUCorrectionProposal.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/TUCorrectionProposal.java index beca666a37b..315af328b2f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/TUCorrectionProposal.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/TUCorrectionProposal.java @@ -14,6 +14,21 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text.correction.proposals; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.corext.codemanipulation.StubUtility; +import org.eclipse.cdt.internal.corext.fix.LinkedProposalModel; +import org.eclipse.cdt.internal.corext.fix.LinkedProposalPositionGroup; +import org.eclipse.cdt.internal.corext.util.Resources; +import org.eclipse.cdt.internal.corext.util.Strings; +import org.eclipse.cdt.internal.ui.CUIStatus; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.text.correction.CorrectionMessages; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.internal.ui.util.ExceptionHandler; +import org.eclipse.cdt.internal.ui.viewsupport.LinkedProposalModelPresenter; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.refactoring.CTextFileChange; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; @@ -41,24 +56,6 @@ import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.refactoring.CTextFileChange; - -import org.eclipse.cdt.internal.corext.codemanipulation.StubUtility; -import org.eclipse.cdt.internal.corext.fix.LinkedProposalModel; -import org.eclipse.cdt.internal.corext.fix.LinkedProposalPositionGroup; -import org.eclipse.cdt.internal.corext.util.Resources; -import org.eclipse.cdt.internal.corext.util.Strings; - -import org.eclipse.cdt.internal.ui.CUIStatus; -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.text.correction.CorrectionMessages; -import org.eclipse.cdt.internal.ui.util.EditorUtility; -import org.eclipse.cdt.internal.ui.util.ExceptionHandler; -import org.eclipse.cdt.internal.ui.viewsupport.LinkedProposalModelPresenter; - /** * A proposal for quick fixes and quick assist that work on a single compilation unit. * Either a {@link TextChange text change} is directly passed in the constructor or method diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/AbstractDocCommentProposalComputer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/AbstractDocCommentProposalComputer.java index 74d2f2ddc56..3785d1c7f26 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/AbstractDocCommentProposalComputer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/AbstractDocCommentProposalComputer.java @@ -15,6 +15,13 @@ package org.eclipse.cdt.internal.ui.text.doctools; import java.util.List; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.IWorkingCopyManager; +import org.eclipse.cdt.ui.text.contentassist.ContentAssistInvocationContext; +import org.eclipse.cdt.ui.text.contentassist.ICompletionProposalComputer; +import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; +import org.eclipse.cdt.ui.text.doctools.IDocCommentViewerConfiguration; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.text.contentassist.ICompletionProposal; @@ -24,14 +31,6 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.IWorkingCopyManager; -import org.eclipse.cdt.ui.text.contentassist.ContentAssistInvocationContext; -import org.eclipse.cdt.ui.text.contentassist.ICompletionProposalComputer; -import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; -import org.eclipse.cdt.ui.text.doctools.IDocCommentViewerConfiguration; - abstract class AbstractDocCommentProposalComputer implements ICompletionProposalComputer { protected abstract IDocCommentViewerConfiguration getConfiguration(IDocCommentOwner owner); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentOwner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentOwner.java index 667f9009d97..68444ef3cf9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentOwner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentOwner.java @@ -13,10 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text.doctools; -import org.eclipse.core.runtime.Assert; - import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; import org.eclipse.cdt.ui.text.doctools.IDocCommentViewerConfiguration; +import org.eclipse.core.runtime.Assert; /** * Internal implementation of IDocCommentOwner diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentOwnerManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentOwnerManager.java index fc86fcf4bac..021e5a921d1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentOwnerManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentOwnerManager.java @@ -15,12 +15,16 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text.doctools; -import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; +import org.eclipse.cdt.ui.text.doctools.IDocCommentOwnershipListener; +import org.eclipse.cdt.ui.text.doctools.IDocCommentViewerConfiguration; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -38,11 +42,7 @@ import org.eclipse.core.runtime.preferences.DefaultScope; import org.eclipse.core.runtime.preferences.InstanceScope; import org.osgi.service.prefs.Preferences; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; -import org.eclipse.cdt.ui.text.doctools.IDocCommentOwnershipListener; -import org.eclipse.cdt.ui.text.doctools.IDocCommentViewerConfiguration; +import com.ibm.icu.text.MessageFormat; /** * This class manages which IDocCommentOwner's are available in the run-time, and how they map to diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentSpellDictionary.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentSpellDictionary.java index 1f67cc5f05b..ce92b57f245 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentSpellDictionary.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentSpellDictionary.java @@ -15,12 +15,10 @@ package org.eclipse.cdt.internal.ui.text.doctools; import java.net.URL; -import org.eclipse.core.runtime.Assert; - -import org.eclipse.cdt.ui.text.doctools.IDocCommentSimpleDictionary; - import org.eclipse.cdt.internal.ui.text.spelling.engine.AbstractSpellDictionary; import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellDictionary; +import org.eclipse.cdt.ui.text.doctools.IDocCommentSimpleDictionary; +import org.eclipse.core.runtime.Assert; /** * Adapter from interim public {@link IDocCommentSimpleDictionary} to internal {@link ISpellDictionary} diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/EditorReopener.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/EditorReopener.java index ce996ab75a6..e68a3af1e6e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/EditorReopener.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/EditorReopener.java @@ -16,6 +16,15 @@ package org.eclipse.cdt.internal.ui.text.doctools; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.internal.ui.editor.ITranslationUnitEditorInput; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.internal.ui.util.ExternalEditorInput; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; +import org.eclipse.cdt.ui.text.doctools.IDocCommentOwnershipListener; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -35,17 +44,6 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.progress.WorkbenchJob; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; -import org.eclipse.cdt.ui.text.doctools.IDocCommentOwnershipListener; - -import org.eclipse.cdt.internal.ui.editor.ITranslationUnitEditorInput; -import org.eclipse.cdt.internal.ui.util.EditorUtility; -import org.eclipse.cdt.internal.ui.util.ExternalEditorInput; - /** * Listens to change in doc-comment ownership and reinitializes * the editors (or a safe superset of) that need reopening. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/NullDocCommentViewerConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/NullDocCommentViewerConfiguration.java index 21b626728f6..a31f3e09711 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/NullDocCommentViewerConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/NullDocCommentViewerConfiguration.java @@ -13,15 +13,14 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text.doctools; -import org.eclipse.jface.text.IAutoEditStrategy; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.ITextDoubleClickStrategy; - import org.eclipse.cdt.ui.text.ICTokenScanner; import org.eclipse.cdt.ui.text.ITokenStoreFactory; import org.eclipse.cdt.ui.text.contentassist.ICompletionProposalComputer; import org.eclipse.cdt.ui.text.doctools.IDocCommentDictionary; import org.eclipse.cdt.ui.text.doctools.IDocCommentViewerConfiguration; +import org.eclipse.jface.text.IAutoEditStrategy; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.ITextDoubleClickStrategy; public class NullDocCommentViewerConfiguration implements IDocCommentViewerConfiguration { public static final IDocCommentViewerConfiguration INSTANCE = new NullDocCommentViewerConfiguration(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/ProjectMap.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/ProjectMap.java index 8a71a88c3ea..5949cf86e9e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/ProjectMap.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/ProjectMap.java @@ -18,6 +18,11 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.core.settings.model.ICStorageElement; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; @@ -26,12 +31,6 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.core.settings.model.ICStorageElement; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; - /** * A ProjectMap is an internal abstraction which * <ul> diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/CFoldingStructureProviderDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/CFoldingStructureProviderDescriptor.java index 9d5f751410f..cf2f9153fbe 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/CFoldingStructureProviderDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/CFoldingStructureProviderDescriptor.java @@ -14,13 +14,12 @@ package org.eclipse.cdt.internal.ui.text.folding; +import org.eclipse.cdt.ui.text.folding.ICFoldingPreferenceBlock; +import org.eclipse.cdt.ui.text.folding.ICFoldingStructureProvider; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.cdt.ui.text.folding.ICFoldingPreferenceBlock; -import org.eclipse.cdt.ui.text.folding.ICFoldingStructureProvider; - /** * Describes a contribution to the folding provider extension point. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingPreferenceBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingPreferenceBlock.java index 1de4d6ce42f..1a2c0194442 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingPreferenceBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingPreferenceBlock.java @@ -21,6 +21,12 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import org.eclipse.cdt.internal.ui.preferences.OverlayPreferenceStore; +import org.eclipse.cdt.internal.ui.preferences.OverlayPreferenceStore.OverlayKey; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.folding.ICFoldingPreferenceBlock; +import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; @@ -31,14 +37,6 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.folding.ICFoldingPreferenceBlock; -import org.eclipse.cdt.utils.ui.controls.ControlFactory; - -import org.eclipse.cdt.internal.ui.preferences.OverlayPreferenceStore; -import org.eclipse.cdt.internal.ui.preferences.OverlayPreferenceStore.OverlayKey; - /** */ public class DefaultCFoldingPreferenceBlock implements ICFoldingPreferenceBlock { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java index 47e5b26dfc1..bd0d41fabd3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java @@ -29,32 +29,6 @@ import java.util.List; import java.util.Map; import java.util.Stack; -import org.eclipse.core.runtime.Assert; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.text.ITypedRegion; -import org.eclipse.jface.text.Position; -import org.eclipse.jface.text.Region; -import org.eclipse.jface.text.TextUtilities; -import org.eclipse.jface.text.source.Annotation; -import org.eclipse.jface.text.source.projection.IProjectionListener; -import org.eclipse.jface.text.source.projection.IProjectionPosition; -import org.eclipse.jface.text.source.projection.ProjectionAnnotation; -import org.eclipse.jface.text.source.projection.ProjectionAnnotationModel; -import org.eclipse.jface.text.source.projection.ProjectionViewer; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.ui.texteditor.IDocumentProvider; -import org.eclipse.ui.texteditor.ITextEditor; - import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTBreakStatement; import org.eclipse.cdt.core.dom.ast.IASTCaseStatement; @@ -92,20 +66,43 @@ import org.eclipse.cdt.core.model.ISourceRange; import org.eclipse.cdt.core.model.ISourceReference; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.parser.IProblem; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.ICPartitions; -import org.eclipse.cdt.ui.text.folding.ICFoldingStructureProvider; - import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; import org.eclipse.cdt.internal.core.model.ASTCache; - import org.eclipse.cdt.internal.ui.editor.ASTProvider; -import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.cdt.internal.ui.editor.ASTProvider.WAIT_FLAG; +import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.cdt.internal.ui.text.DocumentCharacterIterator; import org.eclipse.cdt.internal.ui.text.ICReconcilingListener; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.ICPartitions; +import org.eclipse.cdt.ui.text.folding.ICFoldingStructureProvider; +import org.eclipse.core.runtime.Assert; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.jface.text.ITypedRegion; +import org.eclipse.jface.text.Position; +import org.eclipse.jface.text.Region; +import org.eclipse.jface.text.TextUtilities; +import org.eclipse.jface.text.source.Annotation; +import org.eclipse.jface.text.source.projection.IProjectionListener; +import org.eclipse.jface.text.source.projection.IProjectionPosition; +import org.eclipse.jface.text.source.projection.ProjectionAnnotation; +import org.eclipse.jface.text.source.projection.ProjectionAnnotationModel; +import org.eclipse.jface.text.source.projection.ProjectionViewer; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.ui.texteditor.IDocumentProvider; +import org.eclipse.ui.texteditor.ITextEditor; /** * Default implementation of a {@link ICFoldingStructureProvider}. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/AddWordProposal.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/AddWordProposal.java index 8b9a7316d98..0dcec187272 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/AddWordProposal.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/AddWordProposal.java @@ -15,6 +15,13 @@ package org.eclipse.cdt.internal.ui.text.spelling; +import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellCheckEngine; +import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellChecker; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.ICCompletionProposal; +import org.eclipse.cdt.ui.text.IInvocationContext; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialogWithToggle; import org.eclipse.jface.text.IDocument; @@ -27,15 +34,6 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.dialogs.PreferencesUtil; import org.eclipse.ui.texteditor.spelling.SpellingProblem; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.ICCompletionProposal; -import org.eclipse.cdt.ui.text.IInvocationContext; - -import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellCheckEngine; -import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellChecker; - /** * Proposal to add the unknown word to the dictionaries. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingEngine.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingEngine.java index dbd3e0a63d1..5701e2d253f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingEngine.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingEngine.java @@ -16,6 +16,19 @@ package org.eclipse.cdt.internal.ui.text.spelling; +import org.eclipse.cdt.core.dom.ast.gnu.cpp.GPPLanguage; +import org.eclipse.cdt.internal.ui.text.CPreprocessorScanner; +import org.eclipse.cdt.internal.ui.text.FastCPartitioner; +import org.eclipse.cdt.internal.ui.text.doctools.DocCommentSpellDictionary; +import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellChecker; +import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellDictionary; +import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellEventListener; +import org.eclipse.cdt.ui.text.ICPartitions; +import org.eclipse.cdt.ui.text.ITokenStore; +import org.eclipse.cdt.ui.text.ITokenStoreFactory; +import org.eclipse.cdt.ui.text.doctools.IDocCommentDictionary; +import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; +import org.eclipse.cdt.ui.text.doctools.IDocCommentSimpleDictionary; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.BadLocationException; @@ -32,21 +45,6 @@ import org.eclipse.jface.text.rules.Token; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.ui.texteditor.spelling.ISpellingProblemCollector; -import org.eclipse.cdt.core.dom.ast.gnu.cpp.GPPLanguage; -import org.eclipse.cdt.ui.text.ICPartitions; -import org.eclipse.cdt.ui.text.ITokenStore; -import org.eclipse.cdt.ui.text.ITokenStoreFactory; -import org.eclipse.cdt.ui.text.doctools.IDocCommentDictionary; -import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; -import org.eclipse.cdt.ui.text.doctools.IDocCommentSimpleDictionary; - -import org.eclipse.cdt.internal.ui.text.CPreprocessorScanner; -import org.eclipse.cdt.internal.ui.text.FastCPartitioner; -import org.eclipse.cdt.internal.ui.text.doctools.DocCommentSpellDictionary; -import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellChecker; -import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellDictionary; -import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellEventListener; - /** * C/C++ spelling engine */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingProblem.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingProblem.java index 7ee3703d12f..eaf44cb24fc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingProblem.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingProblem.java @@ -19,6 +19,13 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.eclipse.cdt.internal.ui.text.IHtmlTagConstants; +import org.eclipse.cdt.internal.ui.text.correction.CorrectionContext; +import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellCheckEngine; +import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellChecker; +import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellEvent; +import org.eclipse.cdt.internal.ui.text.spelling.engine.RankedWordProposal; +import org.eclipse.cdt.ui.text.ICCompletionProposal; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; @@ -27,15 +34,6 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.osgi.util.NLS; import org.eclipse.ui.texteditor.spelling.SpellingProblem; -import org.eclipse.cdt.ui.text.ICCompletionProposal; - -import org.eclipse.cdt.internal.ui.text.IHtmlTagConstants; -import org.eclipse.cdt.internal.ui.text.correction.CorrectionContext; -import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellCheckEngine; -import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellChecker; -import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellEvent; -import org.eclipse.cdt.internal.ui.text.spelling.engine.RankedWordProposal; - /** * A {@link SpellingProblem} that adapts a {@link ISpellEvent}. * <p> diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingReconcileStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingReconcileStrategy.java index 3eaea0012e6..9f0473d9445 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingReconcileStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingReconcileStrategy.java @@ -15,6 +15,9 @@ package org.eclipse.cdt.internal.ui.text.spelling; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.model.IProblemRequestor; +import org.eclipse.cdt.core.parser.IProblem; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.content.IContentType; import org.eclipse.jface.text.BadLocationException; @@ -31,10 +34,6 @@ import org.eclipse.ui.texteditor.spelling.SpellingProblem; import org.eclipse.ui.texteditor.spelling.SpellingReconcileStrategy; import org.eclipse.ui.texteditor.spelling.SpellingService; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.model.IProblemRequestor; -import org.eclipse.cdt.core.parser.IProblem; - /** * Reconcile strategy for spell checking comments. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CoreSpellingProblem.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CoreSpellingProblem.java index f8aef7e6ef9..497745aee7f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CoreSpellingProblem.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CoreSpellingProblem.java @@ -14,13 +14,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text.spelling; +import org.eclipse.cdt.core.parser.AbstractPersistableProblem; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; import org.eclipse.osgi.util.NLS; -import org.eclipse.cdt.core.parser.AbstractPersistableProblem; - /** * Spelling problem to be accepted by problem requesters. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/DisableSpellCheckingProposal.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/DisableSpellCheckingProposal.java index 0f547d13435..594c7405600 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/DisableSpellCheckingProposal.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/DisableSpellCheckingProposal.java @@ -14,6 +14,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text.spelling; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.text.ICCompletionProposal; +import org.eclipse.cdt.ui.text.IInvocationContext; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.contentassist.IContextInformation; @@ -22,10 +25,6 @@ import org.eclipse.swt.graphics.Point; import org.eclipse.ui.editors.text.EditorsUI; import org.eclipse.ui.texteditor.spelling.SpellingService; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.text.ICCompletionProposal; -import org.eclipse.cdt.ui.text.IInvocationContext; - /** * Proposal to disable spell checking. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/SpellCheckEngine.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/SpellCheckEngine.java index 79153802d85..d0f6c1c38b7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/SpellCheckEngine.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/SpellCheckEngine.java @@ -28,6 +28,13 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import org.eclipse.cdt.internal.ui.text.spelling.engine.DefaultSpellChecker; +import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellCheckEngine; +import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellChecker; +import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellDictionary; +import org.eclipse.cdt.internal.ui.text.spelling.engine.LocaleSensitiveSpellDictionary; +import org.eclipse.cdt.internal.ui.text.spelling.engine.PersistentSpellDictionary; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.variables.IStringVariableManager; @@ -36,15 +43,6 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.text.spelling.engine.DefaultSpellChecker; -import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellCheckEngine; -import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellChecker; -import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellDictionary; -import org.eclipse.cdt.internal.ui.text.spelling.engine.LocaleSensitiveSpellDictionary; -import org.eclipse.cdt.internal.ui.text.spelling.engine.PersistentSpellDictionary; - /** * Spell check engine for C/C++ source spell checking. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/SpellCheckIterator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/SpellCheckIterator.java index bd13890292d..7a399bbb04d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/SpellCheckIterator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/SpellCheckIterator.java @@ -17,15 +17,14 @@ package org.eclipse.cdt.internal.ui.text.spelling; import java.util.LinkedList; import java.util.Locale; +import org.eclipse.cdt.internal.ui.text.IHtmlTagConstants; +import org.eclipse.cdt.internal.ui.text.spelling.engine.DefaultSpellChecker; +import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellCheckIterator; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; import com.ibm.icu.text.BreakIterator; -import org.eclipse.cdt.internal.ui.text.IHtmlTagConstants; -import org.eclipse.cdt.internal.ui.text.spelling.engine.DefaultSpellChecker; -import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellCheckIterator; - /** * Iterator to spell check multiline comment regions. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/SpellingEngine.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/SpellingEngine.java index 2ea13446270..b65fde1a8c2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/SpellingEngine.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/SpellingEngine.java @@ -15,6 +15,10 @@ package org.eclipse.cdt.internal.ui.text.spelling; +import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellCheckEngine; +import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellChecker; +import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellEvent; +import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellEventListener; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; @@ -22,11 +26,6 @@ import org.eclipse.ui.texteditor.spelling.ISpellingEngine; import org.eclipse.ui.texteditor.spelling.ISpellingProblemCollector; import org.eclipse.ui.texteditor.spelling.SpellingContext; -import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellCheckEngine; -import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellChecker; -import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellEvent; -import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellEventListener; - /** * Internal abstract spelling engine, subclasses provide a content-type specific implementation. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/SpellingEngineDispatcher.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/SpellingEngineDispatcher.java index 6de8417fec6..822659eb4e7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/SpellingEngineDispatcher.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/SpellingEngineDispatcher.java @@ -18,6 +18,7 @@ package org.eclipse.cdt.internal.ui.text.spelling; import java.util.HashMap; import java.util.Map; +import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Platform; @@ -30,8 +31,6 @@ import org.eclipse.ui.texteditor.spelling.ISpellingProblemCollector; import org.eclipse.ui.texteditor.spelling.SpellingContext; import org.eclipse.ui.texteditor.spelling.SpellingEngineDescriptor; -import org.eclipse.cdt.core.CCorePlugin; - /** * A dispatcher that decides what spelling engine to use depending on content type. * When C/C++ spelling engine is selected in Preferences/General/Editors/Text Editors/Spelling diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/TaskTagDictionary.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/TaskTagDictionary.java index 23507a0348f..a0a29777859 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/TaskTagDictionary.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/TaskTagDictionary.java @@ -18,14 +18,12 @@ package org.eclipse.cdt.internal.ui.text.spelling; import java.net.URL; import java.util.StringTokenizer; -import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CCorePreferenceConstants; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.ui.text.spelling.engine.AbstractSpellDictionary; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.jface.util.IPropertyChangeListener; +import org.eclipse.jface.util.PropertyChangeEvent; /** * Dictionary for task tags. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/TextSpellingEngine.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/TextSpellingEngine.java index 21e122bfefc..b8035632d8d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/TextSpellingEngine.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/TextSpellingEngine.java @@ -15,16 +15,13 @@ package org.eclipse.cdt.internal.ui.text.spelling; +import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellChecker; +import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellEventListener; import org.eclipse.core.runtime.IProgressMonitor; - import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; - import org.eclipse.ui.texteditor.spelling.ISpellingProblemCollector; -import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellChecker; -import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellEventListener; - /** * Text spelling engine */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordCompletionProposalComputer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordCompletionProposalComputer.java index 898b4a96a09..0755e2613f2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordCompletionProposalComputer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordCompletionProposalComputer.java @@ -19,6 +19,14 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.eclipse.cdt.internal.ui.text.contentassist.CCompletionProposal; +import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellCheckEngine; +import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellChecker; +import org.eclipse.cdt.internal.ui.text.spelling.engine.RankedWordProposal; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.contentassist.ContentAssistInvocationContext; +import org.eclipse.cdt.ui.text.contentassist.ICompletionProposalComputer; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.DocumentEvent; @@ -27,16 +35,6 @@ import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContextInformation; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.contentassist.ContentAssistInvocationContext; -import org.eclipse.cdt.ui.text.contentassist.ICompletionProposalComputer; - -import org.eclipse.cdt.internal.ui.text.contentassist.CCompletionProposal; -import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellCheckEngine; -import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellChecker; -import org.eclipse.cdt.internal.ui.text.spelling.engine.RankedWordProposal; - /** * Content assist processor to complete words. * <strong>Note:</strong> This is currently not supported because the spelling engine diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordCorrectionProposal.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordCorrectionProposal.java index ecdbbfcc60a..6f22899af75 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordCorrectionProposal.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordCorrectionProposal.java @@ -15,6 +15,10 @@ package org.eclipse.cdt.internal.ui.text.spelling; +import org.eclipse.cdt.internal.ui.text.IHtmlTagConstants; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.text.ICCompletionProposal; +import org.eclipse.cdt.ui.text.IInvocationContext; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.contentassist.IContextInformation; @@ -22,12 +26,6 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.text.ICCompletionProposal; -import org.eclipse.cdt.ui.text.IInvocationContext; - -import org.eclipse.cdt.internal.ui.text.IHtmlTagConstants; - /** * Proposal to correct the incorrectly spelled word. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordIgnoreProposal.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordIgnoreProposal.java index 420907715bf..ee0ab353581 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordIgnoreProposal.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordIgnoreProposal.java @@ -15,6 +15,11 @@ package org.eclipse.cdt.internal.ui.text.spelling; +import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellCheckEngine; +import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellChecker; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.text.ICCompletionProposal; +import org.eclipse.cdt.ui.text.IInvocationContext; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.contentassist.IContextInformation; import org.eclipse.jface.text.quickassist.IQuickAssistInvocationContext; @@ -24,13 +29,6 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; import org.eclipse.ui.texteditor.spelling.SpellingProblem; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.text.ICCompletionProposal; -import org.eclipse.cdt.ui.text.IInvocationContext; - -import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellCheckEngine; -import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellChecker; - /** * Proposal to ignore the word during the current editing session. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordQuickFixProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordQuickFixProcessor.java index 08a433a0848..e116029138d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordQuickFixProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordQuickFixProcessor.java @@ -19,18 +19,16 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.eclipse.core.runtime.CoreException; - import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.text.ICCompletionProposal; -import org.eclipse.cdt.ui.text.IInvocationContext; -import org.eclipse.cdt.ui.text.IProblemLocation; -import org.eclipse.cdt.ui.text.IQuickFixProcessor; - import org.eclipse.cdt.internal.ui.text.IHtmlTagConstants; import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellCheckEngine; import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellChecker; import org.eclipse.cdt.internal.ui.text.spelling.engine.RankedWordProposal; +import org.eclipse.cdt.ui.text.ICCompletionProposal; +import org.eclipse.cdt.ui.text.IInvocationContext; +import org.eclipse.cdt.ui.text.IProblemLocation; +import org.eclipse.cdt.ui.text.IQuickFixProcessor; +import org.eclipse.core.runtime.CoreException; /** * Quick fix processor for incorrectly spelled words. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/AbstractSpellDictionary.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/AbstractSpellDictionary.java index 6a3afc60ece..acc7adccf03 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/AbstractSpellDictionary.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/AbstractSpellDictionary.java @@ -34,16 +34,14 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; +import org.eclipse.cdt.internal.ui.text.spelling.Messages; +import org.eclipse.cdt.internal.ui.text.spelling.SpellingPreferences; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.osgi.util.NLS; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.text.spelling.Messages; -import org.eclipse.cdt.internal.ui.text.spelling.SpellingPreferences; - /** * Partial implementation of a spell dictionary. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/DefaultSpellChecker.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/DefaultSpellChecker.java index aae636e8602..07862f2b2e6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/DefaultSpellChecker.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/DefaultSpellChecker.java @@ -21,11 +21,10 @@ import java.util.Iterator; import java.util.Locale; import java.util.Set; +import org.eclipse.cdt.internal.ui.text.spelling.SpellingPreferences; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.cdt.internal.ui.text.spelling.SpellingPreferences; - /** * Default spell checker for standard text. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateEngine.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateEngine.java index fc55726179f..968e479546f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateEngine.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateEngine.java @@ -23,6 +23,14 @@ import java.util.Map.Entry; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.corext.template.c.TranslationUnitContext; +import org.eclipse.cdt.internal.corext.template.c.TranslationUnitContextType; +import org.eclipse.cdt.internal.ui.text.c.hover.SourceViewerInformationControl; +import org.eclipse.cdt.internal.ui.text.contentassist.RelevanceConstants; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.ICCompletionProposal; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; @@ -43,17 +51,6 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.widgets.Shell; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.ICCompletionProposal; - -import org.eclipse.cdt.internal.corext.template.c.TranslationUnitContext; -import org.eclipse.cdt.internal.corext.template.c.TranslationUnitContextType; - -import org.eclipse.cdt.internal.ui.text.c.hover.SourceViewerInformationControl; -import org.eclipse.cdt.internal.ui.text.contentassist.RelevanceConstants; - public class TemplateEngine { private static final String $_LINE_SELECTION = "${" + GlobalTemplateVariables.LineSelection.NAME + '}'; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateVariableProposal.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateVariableProposal.java index a8580dc07ec..0f67f582593 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateVariableProposal.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateVariableProposal.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.text.template; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; @@ -25,8 +26,6 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.widgets.Shell; -import org.eclipse.cdt.ui.CUIPlugin; - /** * A proposal for insertion of template variables. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/util/CColorManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/util/CColorManager.java index 9e0ec4c93ae..cee9988ae4b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/util/CColorManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/util/CColorManager.java @@ -19,12 +19,11 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import org.eclipse.cdt.ui.text.IColorManager; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.widgets.Display; -import org.eclipse.cdt.ui.text.IColorManager; - /** * CDT color manager. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/OpenTypeHierarchyAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/OpenTypeHierarchyAction.java index b410a5ba223..3044ad2950e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/OpenTypeHierarchyAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/OpenTypeHierarchyAction.java @@ -14,16 +14,15 @@ package org.eclipse.cdt.internal.ui.typehierarchy; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.actions.SelectionDispatchAction; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.text.ITextSelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.IWorkbenchSite; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.actions.SelectionDispatchAction; - public class OpenTypeHierarchyAction extends SelectionDispatchAction { private ITextEditor fEditor; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/OpenTypeInHierarchyAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/OpenTypeInHierarchyAction.java index 9f0cb325878..da72bebb564 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/OpenTypeInHierarchyAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/OpenTypeInHierarchyAction.java @@ -14,6 +14,10 @@ package org.eclipse.cdt.internal.ui.typehierarchy; +import org.eclipse.cdt.core.browser.ITypeInfo; +import org.eclipse.cdt.core.browser.ITypeReference; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.internal.ui.browser.opentype.ElementSelectionDialog; import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; @@ -27,12 +31,6 @@ import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindowActionDelegate; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.core.browser.ITypeInfo; -import org.eclipse.cdt.core.browser.ITypeReference; -import org.eclipse.cdt.core.model.ICElement; - -import org.eclipse.cdt.internal.ui.browser.opentype.ElementSelectionDialog; - public class OpenTypeInHierarchyAction implements IWorkbenchWindowActionDelegate { private static final int[] VISIBLE_TYPES = { ICElement.C_CLASS, ICElement.C_STRUCT, ICElement.C_TYPEDEF, diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THDropTargetListener.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THDropTargetListener.java index 04014fa6c97..5788812cb2b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THDropTargetListener.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THDropTargetListener.java @@ -16,6 +16,7 @@ package org.eclipse.cdt.internal.ui.typehierarchy; import java.util.Iterator; +import org.eclipse.cdt.core.model.ICElement; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.util.LocalSelectionTransfer; import org.eclipse.jface.viewers.ISelection; @@ -26,8 +27,6 @@ import org.eclipse.swt.dnd.DropTargetListener; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.cdt.core.model.ICElement; - public class THDropTargetListener implements DropTargetListener { private ICElement fInput; private boolean fEnabled = true; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THGraph.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THGraph.java index 13d8e5a8abc..68aad0b4735 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THGraph.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THGraph.java @@ -19,9 +19,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; - import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.ICompositeType; import org.eclipse.cdt.core.dom.ast.IEnumeration; @@ -33,11 +30,11 @@ import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.index.IIndexBinding; import org.eclipse.cdt.core.index.IIndexName; import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.core.model.ext.ICElementHandle; - import org.eclipse.cdt.internal.ui.viewsupport.IndexUI; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; class THGraph { private static final ICElement[] NO_MEMBERS = {}; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHierarchyModel.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHierarchyModel.java index 6b3cb5fb866..11f620ee848 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHierarchyModel.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHierarchyModel.java @@ -18,25 +18,23 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.ISchedulingRule; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.progress.IWorkbenchSiteProgressService; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.index.IIndexManager; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.ui.viewsupport.IndexUI; import org.eclipse.cdt.internal.ui.viewsupport.WorkingSetFilterUI; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.ISchedulingRule; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.progress.IWorkbenchSiteProgressService; class THHierarchyModel { public class BackgroundJob extends Job { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryAction.java index 234a14670bb..bb1d08f48b4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryAction.java @@ -14,13 +14,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.typehierarchy; -import org.eclipse.jface.action.Action; -import org.eclipse.jface.resource.ImageDescriptor; - import org.eclipse.cdt.core.model.ICElement; - import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ImageDescriptor; /** * Action used for the include browser forward / backward buttons diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryDropDownAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryDropDownAction.java index 71751d69d85..418d7f52b63 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryDropDownAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryDropDownAction.java @@ -14,6 +14,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.typehierarchy; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.internal.ui.CPluginImages; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.ActionContributionItem; import org.eclipse.jface.action.IMenuCreator; @@ -22,10 +24,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.MenuItem; -import org.eclipse.cdt.core.model.ICElement; - -import org.eclipse.cdt.internal.ui.CPluginImages; - public class THHistoryDropDownAction extends Action implements IMenuCreator { public static class ClearHistoryAction extends Action { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryListAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryListAction.java index 3aa26de922d..777d04c465b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryListAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryListAction.java @@ -17,11 +17,19 @@ package org.eclipse.cdt.internal.ui.typehierarchy; import java.util.Arrays; import java.util.List; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; +import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.action.Action; import org.eclipse.jface.dialogs.StatusDialog; -import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; @@ -30,16 +38,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; -import org.eclipse.cdt.core.model.ICElement; - -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; -import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; - public class THHistoryListAction extends Action { private class HistoryListDialog extends StatusDialog { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THInformationControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THInformationControl.java index f59e7fc6caa..3d1cb6258cd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THInformationControl.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THInformationControl.java @@ -16,6 +16,12 @@ package org.eclipse.cdt.internal.ui.typehierarchy; import java.util.Iterator; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds; +import org.eclipse.cdt.internal.ui.text.AbstractInformationControl; +import org.eclipse.cdt.internal.ui.viewsupport.EditorOpener; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.bindings.Trigger; import org.eclipse.jface.bindings.TriggerSequence; import org.eclipse.jface.bindings.keys.KeyStroke; @@ -40,14 +46,6 @@ import org.eclipse.ui.progress.IWorkbenchSiteProgressService; import com.ibm.icu.text.MessageFormat; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds; -import org.eclipse.cdt.internal.ui.text.AbstractInformationControl; -import org.eclipse.cdt.internal.ui.viewsupport.EditorOpener; - public class THInformationControl extends AbstractInformationControl implements ITHModelPresenter { private THHierarchyModel fModel; private THLabelProvider fHierarchyLabelProvider; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THLabelProvider.java index 4224b27b41d..fbbe24e1c24 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THLabelProvider.java @@ -16,6 +16,13 @@ package org.eclipse.cdt.internal.ui.typehierarchy; import java.util.HashMap; import java.util.Iterator; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.internal.ui.viewsupport.AppearanceAwareLabelProvider; +import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; +import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; +import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider; +import org.eclipse.cdt.internal.ui.viewsupport.ImageImageDescriptor; +import org.eclipse.cdt.ui.CElementImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.ILabelDecorator; import org.eclipse.jface.viewers.StyledCellLabelProvider; @@ -26,15 +33,6 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.widgets.Display; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; -import org.eclipse.cdt.ui.CElementImageDescriptor; - -import org.eclipse.cdt.internal.ui.viewsupport.AppearanceAwareLabelProvider; -import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; -import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider; -import org.eclipse.cdt.internal.ui.viewsupport.ImageImageDescriptor; - public class THLabelProvider extends AppearanceAwareLabelProvider { private final static long LABEL_OPTIONS_SIMPLE = CElementLabels.ALL_FULLY_QUALIFIED diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THNode.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THNode.java index 400d2c9fd78..1a815f29eb5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THNode.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THNode.java @@ -19,9 +19,8 @@ import java.util.Iterator; import java.util.List; import java.util.Objects; -import org.eclipse.core.runtime.IAdaptable; - import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.core.runtime.IAdaptable; public class THNode implements IAdaptable { private THNode fParent; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java index 48837fa3a6a..05ef4a1e877 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java @@ -18,6 +18,31 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.IDeclaration; +import org.eclipse.cdt.core.model.IMember; +import org.eclipse.cdt.core.model.IMethodDeclaration; +import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.IContextMenuConstants; +import org.eclipse.cdt.internal.ui.actions.CopyTreeAction; +import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds; +import org.eclipse.cdt.internal.ui.search.actions.SelectionSearchGroup; +import org.eclipse.cdt.internal.ui.viewsupport.AdaptingSelectionProvider; +import org.eclipse.cdt.internal.ui.viewsupport.AppearanceAwareLabelProvider; +import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; +import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; +import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider; +import org.eclipse.cdt.internal.ui.viewsupport.DecoratingCLabelProvider; +import org.eclipse.cdt.internal.ui.viewsupport.EditorOpener; +import org.eclipse.cdt.internal.ui.viewsupport.SelectionProviderMediator; +import org.eclipse.cdt.internal.ui.viewsupport.WorkingSetFilterUI; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.actions.CdtActionConstants; +import org.eclipse.cdt.ui.actions.OpenViewActionGroup; +import org.eclipse.cdt.ui.refactoring.actions.CRefactoringActionGroup; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; @@ -81,33 +106,6 @@ import org.eclipse.ui.progress.IWorkbenchSiteProgressService; import com.ibm.icu.text.MessageFormat; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.IDeclaration; -import org.eclipse.cdt.core.model.IMember; -import org.eclipse.cdt.core.model.IMethodDeclaration; -import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.actions.CdtActionConstants; -import org.eclipse.cdt.ui.actions.OpenViewActionGroup; -import org.eclipse.cdt.ui.refactoring.actions.CRefactoringActionGroup; - -import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.IContextMenuConstants; -import org.eclipse.cdt.internal.ui.actions.CopyTreeAction; -import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds; -import org.eclipse.cdt.internal.ui.search.actions.SelectionSearchGroup; -import org.eclipse.cdt.internal.ui.viewsupport.AdaptingSelectionProvider; -import org.eclipse.cdt.internal.ui.viewsupport.AppearanceAwareLabelProvider; -import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; -import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; -import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider; -import org.eclipse.cdt.internal.ui.viewsupport.DecoratingCLabelProvider; -import org.eclipse.cdt.internal.ui.viewsupport.EditorOpener; -import org.eclipse.cdt.internal.ui.viewsupport.SelectionProviderMediator; -import org.eclipse.cdt.internal.ui.viewsupport.WorkingSetFilterUI; - /** * The view part for the include browser. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/TypeHierarchyUI.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/TypeHierarchyUI.java index 1e32706d185..f70d181939e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/TypeHierarchyUI.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/TypeHierarchyUI.java @@ -14,20 +14,6 @@ package org.eclipse.cdt.internal.ui.typehierarchy; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.text.Region; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.texteditor.ITextEditor; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IBinding; @@ -45,11 +31,23 @@ import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.IFunctionDeclaration; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.ui.util.ExceptionHandler; import org.eclipse.cdt.internal.ui.util.StatusLineHandler; import org.eclipse.cdt.internal.ui.viewsupport.IndexUI; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.jface.text.Region; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.texteditor.ITextEditor; public class TypeHierarchyUI { private static final int INDEX_SEARCH_OPTION = IIndexManager.ADD_DEPENDENCIES | IIndexManager.ADD_DEPENDENT diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/AbstractResourceActionHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/AbstractResourceActionHandler.java index 5e9c9e953ed..9857ff16194 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/AbstractResourceActionHandler.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/AbstractResourceActionHandler.java @@ -20,6 +20,8 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; +import org.eclipse.cdt.internal.core.AdapterUtil; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; @@ -40,10 +42,6 @@ import org.eclipse.ui.handlers.HandlerUtil; import org.eclipse.ui.handlers.IHandlerService; import org.eclipse.ui.ide.ResourceUtil; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.core.AdapterUtil; - /** * Base class for command handlers operating on resources. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/BusyIndicatorRunnableContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/BusyIndicatorRunnableContext.java index 5333d859e4a..b13f71cb8f0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/BusyIndicatorRunnableContext.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/BusyIndicatorRunnableContext.java @@ -15,14 +15,12 @@ package org.eclipse.cdt.internal.ui.util; import java.lang.reflect.InvocationTargetException; -import org.eclipse.swt.custom.BusyIndicator; - import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; - import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.operation.ModalContext; +import org.eclipse.swt.custom.BusyIndicator; /** * A runnable context that shows the busy cursor instead of a progress diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/CHelpDisplayContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/CHelpDisplayContext.java index 705d8707962..ca22190e2ec 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/CHelpDisplayContext.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/CHelpDisplayContext.java @@ -18,6 +18,12 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.CHelpProviderManager; +import org.eclipse.cdt.internal.ui.text.CWordFinder; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.ICHelpResourceDescriptor; +import org.eclipse.cdt.ui.text.ICHelpInvocationContext; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.help.HelpSystem; @@ -30,14 +36,6 @@ import org.eclipse.ui.IEditorInput; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.ICHelpResourceDescriptor; -import org.eclipse.cdt.ui.text.ICHelpInvocationContext; - -import org.eclipse.cdt.internal.ui.CHelpProviderManager; -import org.eclipse.cdt.internal.ui.text.CWordFinder; - /** * * @since 2.1 diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/CUIHelp.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/CUIHelp.java index 5004d6d5fb7..ef98dbd47e8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/CUIHelp.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/CUIHelp.java @@ -18,7 +18,6 @@ package org.eclipse.cdt.internal.ui.util; import org.eclipse.cdt.internal.ui.ICHelpContextIds; import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.cdt.internal.ui.text.CWordFinder; - import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.help.HelpSystem; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/DeleteIProblemMarkerAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/DeleteIProblemMarkerAction.java index 6a5cfba29f2..f7a454ae26a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/DeleteIProblemMarkerAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/DeleteIProblemMarkerAction.java @@ -17,6 +17,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.eclipse.cdt.core.model.ICModelMarker; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; @@ -27,8 +28,6 @@ import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.actions.ActionDelegate; -import org.eclipse.cdt.core.model.ICModelMarker; - /** * @author Bogdan Gheorghe */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/DeleteTaskAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/DeleteTaskAction.java index a43bb3ecfe1..ed81ed4d321 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/DeleteTaskAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/DeleteTaskAction.java @@ -17,6 +17,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.eclipse.cdt.core.model.ICModelMarker; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; @@ -27,8 +28,6 @@ import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.actions.ActionDelegate; -import org.eclipse.cdt.core.model.ICModelMarker; - public class DeleteTaskAction extends ActionDelegate implements IObjectActionDelegate { private IStructuredSelection selection; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java index 28d1f52a9e5..3f7204bedfc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java @@ -26,6 +26,28 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.IBinary; +import org.eclipse.cdt.core.model.IBuffer; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.IIncludeReference; +import org.eclipse.cdt.core.model.ISourceRange; +import org.eclipse.cdt.core.model.ISourceReference; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.cdt.core.resources.FileStorage; +import org.eclipse.cdt.internal.core.resources.ResourceLookup; +import org.eclipse.cdt.internal.ui.ICStatusConstants; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.editor.CEditorMessages; +import org.eclipse.cdt.internal.ui.editor.ITranslationUnitEditorInput; +import org.eclipse.cdt.internal.ui.text.LineComparator; +import org.eclipse.cdt.ui.CDTUITools; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.utils.UNCPathConverter; import org.eclipse.compare.rangedifferencer.IRangeComparator; import org.eclipse.compare.rangedifferencer.RangeDifference; import org.eclipse.compare.rangedifferencer.RangeDifferencer; @@ -83,31 +105,6 @@ import org.eclipse.ui.texteditor.ITextEditor; import com.ibm.icu.text.MessageFormat; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.IBinary; -import org.eclipse.cdt.core.model.IBuffer; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.IIncludeReference; -import org.eclipse.cdt.core.model.ISourceRange; -import org.eclipse.cdt.core.model.ISourceReference; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.core.resources.FileStorage; -import org.eclipse.cdt.ui.CDTUITools; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.utils.UNCPathConverter; - -import org.eclipse.cdt.internal.core.resources.ResourceLookup; - -import org.eclipse.cdt.internal.ui.ICStatusConstants; -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.editor.CEditorMessages; -import org.eclipse.cdt.internal.ui.editor.ITranslationUnitEditorInput; -import org.eclipse.cdt.internal.ui.text.LineComparator; - public class EditorUtility { /** * The ID of the default text editor diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ExceptionHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ExceptionHandler.java index 28e1f7f9b3f..1ad7a7238cc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ExceptionHandler.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ExceptionHandler.java @@ -16,17 +16,15 @@ package org.eclipse.cdt.internal.ui.util; import java.io.StringWriter; import java.lang.reflect.InvocationTargetException; -import org.eclipse.swt.widgets.Shell; - +import org.eclipse.cdt.internal.ui.CStatusConstants; +import org.eclipse.cdt.internal.ui.CUIMessages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; - -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.internal.ui.CStatusConstants; -import org.eclipse.cdt.internal.ui.CUIMessages; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.swt.widgets.Shell; /** * The default exception handler shows an error dialog when one of its handle methods diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ExternalEditorInput.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ExternalEditorInput.java index 5cf0798118b..841cbfa27fd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ExternalEditorInput.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ExternalEditorInput.java @@ -16,6 +16,9 @@ package org.eclipse.cdt.internal.ui.util; import java.net.URI; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.editor.ITranslationUnitEditorInput; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.filesystem.EFS; import org.eclipse.core.filesystem.IFileStore; import org.eclipse.core.filesystem.URIUtil; @@ -26,11 +29,6 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.ui.IMemento; import org.eclipse.ui.ide.FileStoreEditorInput; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.editor.ITranslationUnitEditorInput; - /** * An EditorInput for an external (non-workspace) file. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ExternalEditorInputFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ExternalEditorInputFactory.java index 0083833366b..dcf3f868b49 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ExternalEditorInputFactory.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ExternalEditorInputFactory.java @@ -13,6 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.util; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IAdaptable; @@ -22,10 +25,6 @@ import org.eclipse.ui.IElementFactory; import org.eclipse.ui.IMemento; import org.eclipse.ui.IPersistableElement; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ITranslationUnit; - /** * The ExternalEditorInputFactory is used to save and recreate an ExternalEditorInput object. * As such, it implements the IPersistableElement interface for storage diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ImageDescriptorRegistry.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ImageDescriptorRegistry.java index 014abb395ef..70076b62dc7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ImageDescriptorRegistry.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ImageDescriptorRegistry.java @@ -17,12 +17,11 @@ package org.eclipse.cdt.internal.ui.util; import java.util.HashMap; import java.util.Iterator; +import org.eclipse.core.runtime.Assert; +import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.core.runtime.Assert; - /** * A registry that maps <code>ImageDescriptors</code> to <code>Image</code>. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/NameComposer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/NameComposer.java index ae726898dd0..d32da1e3e03 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/NameComposer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/NameComposer.java @@ -17,11 +17,10 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import com.ibm.icu.text.BreakIterator; - +import org.eclipse.cdt.internal.ui.text.CBreakIterator; import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.internal.ui.text.CBreakIterator; +import com.ibm.icu.text.BreakIterator; /** * Composes names according to a particular style. A seed name is split into diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/OpenExternalProblemAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/OpenExternalProblemAction.java index 7123916d8c2..daeb0b303b0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/OpenExternalProblemAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/OpenExternalProblemAction.java @@ -17,6 +17,10 @@ package org.eclipse.cdt.internal.ui.util; import java.io.File; +import org.eclipse.cdt.core.model.ICModelMarker; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.internal.core.model.CModelManager; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; @@ -35,12 +39,6 @@ import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.actions.ActionDelegate; import org.eclipse.ui.ide.IDE; -import org.eclipse.cdt.core.model.ICModelMarker; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.core.model.CModelManager; - public class OpenExternalProblemAction extends ActionDelegate implements IObjectActionDelegate { IStructuredSelection selection; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemMarkerManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemMarkerManager.java index e926b7e3a8a..241b56731ef 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemMarkerManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemMarkerManager.java @@ -16,6 +16,8 @@ package org.eclipse.cdt.internal.ui.util; import java.util.HashSet; +import org.eclipse.cdt.internal.ui.editor.TranslationUnitAnnotationModelEvent; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IMarkerDelta; import org.eclipse.core.resources.IProject; @@ -32,10 +34,6 @@ import org.eclipse.jface.text.source.IAnnotationModelListener; import org.eclipse.jface.text.source.IAnnotationModelListenerExtension; import org.eclipse.swt.widgets.Display; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.editor.TranslationUnitAnnotationModelEvent; - /** * Listens to resource deltas and filters for marker changes of type * IMarker.PROBLEM Viewers showing error ticks should register as listener to diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemTableViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemTableViewer.java index bdde67d0641..7887c2fdbb9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemTableViewer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemTableViewer.java @@ -18,16 +18,14 @@ import java.util.ArrayList; import org.eclipse.cdt.internal.ui.viewsupport.ProblemsLabelDecorator.ProblemsLabelChangedEvent; import org.eclipse.core.resources.IResource; - +import org.eclipse.jface.viewers.IBaseLabelProvider; +import org.eclipse.jface.viewers.LabelProviderChangedEvent; +import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Item; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.Widget; -import org.eclipse.jface.viewers.IBaseLabelProvider; -import org.eclipse.jface.viewers.LabelProviderChangedEvent; -import org.eclipse.jface.viewers.TableViewer; - /** * Extends a TableViewer to allow more performance when showing error ticks. * A <code>ProblemItemMapper</code> is contained that maps all items in diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ResourceToItemsMapper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ResourceToItemsMapper.java index 8319d2d96fb..246f0372f37 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ResourceToItemsMapper.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ResourceToItemsMapper.java @@ -18,6 +18,8 @@ import java.util.HashMap; import java.util.List; import java.util.Stack; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.core.resources.IResource; import org.eclipse.jface.viewers.ContentViewer; import org.eclipse.jface.viewers.ILabelProvider; @@ -26,9 +28,6 @@ import org.eclipse.jface.viewers.ViewerLabel; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Item; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ITranslationUnit; - /** * Helper class for updating error markers and other decorators that work on resources. * Items are mapped to their element's underlying resource. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/RowLayouter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/RowLayouter.java index a24f833fb1b..6da6f94ce91 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/RowLayouter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/RowLayouter.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.util; +import org.eclipse.core.runtime.Assert; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Control; -import org.eclipse.core.runtime.Assert; - /** * Helper class to layout a number of children if the composite uses a <code>GridLayout</code>. * If the numbers of widgets to be layouted into one row is smaller than the number of columns diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/StatusLineHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/StatusLineHandler.java index 43466e5b93f..ca695151401 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/StatusLineHandler.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/StatusLineHandler.java @@ -15,13 +15,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.util; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.action.IStatusLineManager; import org.eclipse.ui.IEditorSite; import org.eclipse.ui.IViewSite; import org.eclipse.ui.IWorkbenchSite; -import org.eclipse.cdt.ui.CUIPlugin; - /** * Utilities for clearing and setting status line. Client should * invoke {@link #clearStatusLine(IWorkbenchSite)} before an operation diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/TableLayoutComposite.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/TableLayoutComposite.java index 26ccb680901..4c2692ea3c9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/TableLayoutComposite.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/TableLayoutComposite.java @@ -16,6 +16,10 @@ package org.eclipse.cdt.internal.ui.util; import java.util.ArrayList; import java.util.List; +import org.eclipse.core.runtime.Assert; +import org.eclipse.jface.viewers.ColumnLayoutData; +import org.eclipse.jface.viewers.ColumnPixelData; +import org.eclipse.jface.viewers.ColumnWeightData; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ControlAdapter; import org.eclipse.swt.events.ControlEvent; @@ -25,11 +29,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.core.runtime.Assert; -import org.eclipse.jface.viewers.ColumnLayoutData; -import org.eclipse.jface.viewers.ColumnPixelData; -import org.eclipse.jface.viewers.ColumnWeightData; - /** * A special composite to layout columns inside a table. The composite is needed since we have * to layout the columns "before" the actual table gets layouted. Hence we can't use a normal diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ViewerPane.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ViewerPane.java index 66c389bc704..41f5b2ab1da 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ViewerPane.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ViewerPane.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.util; +import org.eclipse.jface.action.ToolBarManager; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CLabel; import org.eclipse.swt.custom.ViewForm; @@ -20,8 +21,6 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.ToolBar; -import org.eclipse.jface.action.ToolBarManager; - /** * A <code>ViewerPane</code> is a convenience class which installs a * <code>CLabel</code> and a <code>Toolbar</code> in a <code>ViewForm</code>. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AppearanceAwareLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AppearanceAwareLabelProvider.java index 81e38b41236..0bf2138b306 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AppearanceAwareLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AppearanceAwareLabelProvider.java @@ -18,8 +18,6 @@ package org.eclipse.cdt.internal.ui.viewsupport; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; - /** * CUILabelProvider that respects settings from the Appearance preference page. * Triggers a viewer update when a preference changes (currently none). diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AsyncTreeContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AsyncTreeContentProvider.java index 39f6c5cba3c..13eb49e83c9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AsyncTreeContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AsyncTreeContentProvider.java @@ -19,6 +19,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; +import org.eclipse.cdt.internal.ui.CUIMessages; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -31,8 +32,6 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.swt.SWTException; import org.eclipse.swt.widgets.Display; -import org.eclipse.cdt.internal.ui.CUIMessages; - /** * A TreeContentProvider that supports asyncronous computation of child nodes. * <p> diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/BasicElementLabels.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/BasicElementLabels.java index f1e32860ffc..9aa181733f4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/BasicElementLabels.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/BasicElementLabels.java @@ -16,13 +16,12 @@ package org.eclipse.cdt.internal.ui.viewsupport; import java.io.File; +import org.eclipse.cdt.internal.corext.util.Strings; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IPath; import org.eclipse.osgi.util.TextProcessor; import org.eclipse.ui.IWorkingSet; -import org.eclipse.cdt.internal.corext.util.Strings; - /** * A label provider for basic elements like paths. The label provider will make sure that the labels are correctly * shown in RTL environments. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CDTContextActivator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CDTContextActivator.java index 9f4a622b5a1..e5c2b610a0e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CDTContextActivator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CDTContextActivator.java @@ -20,6 +20,9 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Map; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.internal.ui.editor.CContentOutlinePage; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.ISelectionProvider; @@ -40,11 +43,6 @@ import org.eclipse.ui.navigator.CommonNavigator; import org.eclipse.ui.part.IPage; import org.eclipse.ui.views.contentoutline.ContentOutline; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.editor.CContentOutlinePage; - /** * Once registered as windows listener, observes all part activations. Whenever the * CDT outline view is brought to the front, the CDT context is set. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementImageProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementImageProvider.java index 593a6a2034f..4a6efcf8ce4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementImageProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementImageProvider.java @@ -16,18 +16,6 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.viewsupport; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IPath; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.graphics.Point; -import org.eclipse.ui.ISharedImages; -import org.eclipse.ui.ide.IDE; -import org.eclipse.ui.model.IWorkbenchAdapter; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CoreModel; @@ -50,11 +38,21 @@ import org.eclipse.cdt.core.model.ISourceRoot; import org.eclipse.cdt.core.model.ITemplate; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; +import org.eclipse.cdt.internal.core.model.CModelManager; import org.eclipse.cdt.ui.CDTSharedImages; import org.eclipse.cdt.ui.CElementImageDescriptor; import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.core.model.CModelManager; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IPath; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.Point; +import org.eclipse.ui.ISharedImages; +import org.eclipse.ui.ide.IDE; +import org.eclipse.ui.model.IWorkbenchAdapter; /** * Default strategy of the C plugin for the construction of C element icons. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementLabelComposer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementLabelComposer.java index f063bfa755b..27a5712453b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementLabelComposer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementLabelComposer.java @@ -16,13 +16,6 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.viewsupport; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.viewers.StyledString; -import org.eclipse.jface.viewers.StyledString.Styler; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.IBinary; @@ -40,9 +33,14 @@ import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.model.ITypeDef; import org.eclipse.cdt.core.model.IVariableDeclaration; import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.core.model.CoreModelMessages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.Path; +import org.eclipse.jface.viewers.StyledString; +import org.eclipse.jface.viewers.StyledString.Styler; // Most parts of this file were previously located in CElementLabels. // FlexibleBuffer and sub-types are taken from JDTs JavaElementLabelComposer. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementLabels.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementLabels.java index fded42b05e5..25c9e07cd09 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementLabels.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementLabels.java @@ -15,13 +15,6 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.viewsupport; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IStorage; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jface.viewers.StyledString; -import org.eclipse.osgi.util.TextProcessor; -import org.eclipse.ui.model.IWorkbenchAdapter; - import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.IEnumerator; import org.eclipse.cdt.core.model.IField; @@ -30,10 +23,15 @@ import org.eclipse.cdt.core.model.IMacro; import org.eclipse.cdt.core.model.IMethodDeclaration; import org.eclipse.cdt.core.model.ITypeDef; import org.eclipse.cdt.core.model.IVariableDeclaration; - import org.eclipse.cdt.internal.core.model.CElement; import org.eclipse.cdt.internal.core.model.CoreModelMessages; import org.eclipse.cdt.internal.corext.util.Strings; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IStorage; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.jface.viewers.StyledString; +import org.eclipse.osgi.util.TextProcessor; +import org.eclipse.ui.model.IWorkbenchAdapter; /* * This class is basically a clone of org.eclipse.cdt.core.model.util.CElementLabels diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CUILabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CUILabelProvider.java index 8a9760ab01b..1badfde7f18 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CUILabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CUILabelProvider.java @@ -17,23 +17,21 @@ package org.eclipse.cdt.internal.ui.viewsupport; import java.util.ArrayList; +import org.eclipse.cdt.core.model.ISourceReference; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IStorage; +import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider; import org.eclipse.jface.viewers.IColorProvider; import org.eclipse.jface.viewers.ILabelDecorator; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.StyledCellLabelProvider; import org.eclipse.jface.viewers.StyledString; -import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; -import org.eclipse.cdt.core.model.ISourceReference; -import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; -import org.eclipse.cdt.ui.CUIPlugin; - public class CUILabelProvider extends LabelProvider implements IColorProvider, IStyledLabelProvider { protected CElementImageProvider fImageLabelProvider; protected StorageLabelProvider fStorageLabelProvider; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ColoredViewersManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ColoredViewersManager.java index af1c9a4f89b..08bd86e56d6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ColoredViewersManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ColoredViewersManager.java @@ -17,13 +17,11 @@ package org.eclipse.cdt.internal.ui.viewsupport; import java.util.HashSet; import java.util.Set; -import org.eclipse.swt.widgets.Display; - import org.eclipse.jface.preference.JFacePreferences; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; - +import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IWorkbenchPreferenceConstants; import org.eclipse.ui.PlatformUI; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ColoringLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ColoringLabelProvider.java index 54124617657..ad6cd1f70f3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ColoringLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ColoringLabelProvider.java @@ -14,17 +14,16 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.viewsupport; -import org.eclipse.swt.SWT; -import org.eclipse.swt.custom.StyleRange; - import org.eclipse.jface.viewers.ColumnViewer; import org.eclipse.jface.viewers.DecoratingStyledCellLabelProvider; import org.eclipse.jface.viewers.IDecorationContext; import org.eclipse.jface.viewers.ILabelDecorator; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.StyledString; -import org.eclipse.jface.viewers.ViewerColumn; import org.eclipse.jface.viewers.StyledString.Styler; +import org.eclipse.jface.viewers.ViewerColumn; +import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.StyleRange; public class ColoringLabelProvider extends DecoratingStyledCellLabelProvider implements ILabelProvider { public static final Styler HIGHLIGHT_STYLE = StyledString.createColorRegistryStyler(null, diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CustomBuildSettingsDecorator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CustomBuildSettingsDecorator.java index 7b68d5a2802..620af079c28 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CustomBuildSettingsDecorator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CustomBuildSettingsDecorator.java @@ -15,14 +15,6 @@ package org.eclipse.cdt.internal.ui.viewsupport; import java.util.List; -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IResource; -import org.eclipse.jface.viewers.IDecoration; -import org.eclipse.jface.viewers.ILabelProviderListener; -import org.eclipse.jface.viewers.ILightweightLabelDecorator; - import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvider; import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvidersKeeper; import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager; @@ -33,8 +25,14 @@ import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; import org.eclipse.cdt.core.settings.model.ICProjectDescription; import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager; import org.eclipse.cdt.core.settings.model.ICResourceDescription; - import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IResource; +import org.eclipse.jface.viewers.IDecoration; +import org.eclipse.jface.viewers.ILabelProviderListener; +import org.eclipse.jface.viewers.ILightweightLabelDecorator; /** * Determines if a file or folder got customized build settings and if so decorates with the "wrench" overlay. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/EditorOpener.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/EditorOpener.java index 2a1e109a2d4..84cf8bd3cfd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/EditorOpener.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/EditorOpener.java @@ -16,6 +16,17 @@ package org.eclipse.cdt.internal.ui.viewsupport; import java.net.URI; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.IPositionConverter; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ISourceRange; +import org.eclipse.cdt.core.model.ISourceReference; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.core.model.ext.ICElementHandle; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.internal.ui.util.StatusLineHandler; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.filesystem.EFS; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; @@ -32,20 +43,6 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.ide.IDE; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.IPositionConverter; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ISourceRange; -import org.eclipse.cdt.core.model.ISourceReference; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.core.model.ext.ICElementHandle; - -import org.eclipse.cdt.internal.ui.util.EditorUtility; -import org.eclipse.cdt.internal.ui.util.StatusLineHandler; - /** * An utility to open editors for references or elements. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ExcludedFileDecorator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ExcludedFileDecorator.java index c48d8036132..2936afdb422 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ExcludedFileDecorator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ExcludedFileDecorator.java @@ -13,6 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.viewsupport; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager; +import org.eclipse.cdt.core.settings.model.ICSourceEntry; +import org.eclipse.cdt.core.settings.model.util.CDataUtil; +import org.eclipse.cdt.internal.ui.CPluginImages; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IResource; @@ -23,15 +30,6 @@ import org.eclipse.jface.viewers.IDecoration; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.ILightweightLabelDecorator; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager; -import org.eclipse.cdt.core.settings.model.ICSourceEntry; -import org.eclipse.cdt.core.settings.model.util.CDataUtil; - -import org.eclipse.cdt.internal.ui.CPluginImages; - /** * Determines if a file is excluded from a CDT build and if that is the case decorates the file's icon and * renders the label using the qualifier (gray) color. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ISelectionListenerWithAST.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ISelectionListenerWithAST.java index a181e3a045e..83615272990 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ISelectionListenerWithAST.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ISelectionListenerWithAST.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.viewsupport; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.jface.text.ITextSelection; import org.eclipse.ui.IEditorPart; -import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; - /** * Listener to be informed on text selection changes in an editor (post selection), including the corresponding AST. * The AST is shared and must not be modified. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ImageImageDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ImageImageDescriptor.java index 7ce9634e779..19ad7e71a6e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ImageImageDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ImageImageDescriptor.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.viewsupport; +import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.ImageData; -import org.eclipse.jface.resource.ImageDescriptor; - /** */ public class ImageImageDescriptor extends ImageDescriptor { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IncludeFolderDecorator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IncludeFolderDecorator.java index 5d8346e4c9b..4e0243dda01 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IncludeFolderDecorator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IncludeFolderDecorator.java @@ -13,6 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.viewsupport; +import org.eclipse.cdt.core.model.IIncludeReference; +import org.eclipse.cdt.internal.ui.cview.IncludeReferenceProxy; +import org.eclipse.cdt.ui.CDTSharedImages; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; @@ -22,11 +25,6 @@ import org.eclipse.jface.viewers.IDecoration; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.ILightweightLabelDecorator; -import org.eclipse.cdt.core.model.IIncludeReference; -import org.eclipse.cdt.ui.CDTSharedImages; - -import org.eclipse.cdt.internal.ui.cview.IncludeReferenceProxy; - /** * Determines whether an include folder under "Includes" node does exist * and if not decorates the file's icon with warning overlay and diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexUI.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexUI.java index ce8ddb3cfbf..cf45cfe58b2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexUI.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexUI.java @@ -24,20 +24,6 @@ import java.util.List; import java.util.Properties; import java.util.Set; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.text.Region; -import org.eclipse.osgi.util.NLS; -import org.eclipse.ui.IEditorInput; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.IPositionConverter; import org.eclipse.cdt.core.dom.ast.IASTDeclarator; @@ -88,8 +74,6 @@ import org.eclipse.cdt.core.model.ISourceRange; import org.eclipse.cdt.core.model.ISourceReference; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.core.dom.parser.ASTInternal; import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInstanceCache; @@ -98,8 +82,21 @@ import org.eclipse.cdt.internal.core.model.ext.CElementHandleFactory; import org.eclipse.cdt.internal.core.model.ext.ICElementHandle; import org.eclipse.cdt.internal.core.pdom.indexer.IndexerPreferences; import org.eclipse.cdt.internal.core.resources.ResourceLookup; - import org.eclipse.cdt.internal.ui.editor.ASTProvider; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.jface.text.Region; +import org.eclipse.osgi.util.NLS; +import org.eclipse.ui.IEditorInput; public class IndexUI { private static final ICElementHandle[] EMPTY_ELEMENT_ARRAY = {}; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexedFilesCache.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexedFilesCache.java index df9cc90bc26..5da71f678f1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexedFilesCache.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexedFilesCache.java @@ -19,6 +19,17 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.index.IIndexChangeEvent; +import org.eclipse.cdt.core.index.IIndexChangeListener; +import org.eclipse.cdt.core.index.IIndexFile; +import org.eclipse.cdt.core.index.IIndexFileLocation; +import org.eclipse.cdt.core.index.IIndexManager; +import org.eclipse.cdt.core.index.IIndexerStateEvent; +import org.eclipse.cdt.core.index.IIndexerStateListener; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICProject; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; @@ -33,18 +44,6 @@ import org.eclipse.ui.IDecoratorManager; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.index.IIndex; -import org.eclipse.cdt.core.index.IIndexChangeEvent; -import org.eclipse.cdt.core.index.IIndexChangeListener; -import org.eclipse.cdt.core.index.IIndexFile; -import org.eclipse.cdt.core.index.IIndexFileLocation; -import org.eclipse.cdt.core.index.IIndexManager; -import org.eclipse.cdt.core.index.IIndexerStateEvent; -import org.eclipse.cdt.core.index.IIndexerStateListener; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICProject; - class IndexedFilesCache implements IIndexChangeListener, IIndexerStateListener, ILabelProviderListener { private static final String DECORATOR_ID = "org.eclipse.cdt.ui.indexedFiles"; //$NON-NLS-1$ private static final IndexedFilesCache INSTANCE = new IndexedFilesCache(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexedFilesLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexedFilesLabelProvider.java index cbde8d270f0..9e9197f23f2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexedFilesLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexedFilesLabelProvider.java @@ -14,6 +14,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.viewsupport; +import org.eclipse.cdt.core.CCProjectNature; +import org.eclipse.cdt.core.CProjectNature; +import org.eclipse.cdt.core.index.IIndexFileLocation; +import org.eclipse.cdt.core.index.IndexLocationFactory; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; @@ -23,13 +29,6 @@ import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.ILightweightLabelDecorator; import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.eclipse.cdt.core.CCProjectNature; -import org.eclipse.cdt.core.CProjectNature; -import org.eclipse.cdt.core.index.IIndexFileLocation; -import org.eclipse.cdt.core.index.IndexLocationFactory; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; - /** * A label provider that marks all translation units that are currently part of the index. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/LinkedProposalModelPresenter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/LinkedProposalModelPresenter.java index 1513e1163cc..6fef5e3f0b8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/LinkedProposalModelPresenter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/LinkedProposalModelPresenter.java @@ -16,6 +16,12 @@ package org.eclipse.cdt.internal.ui.viewsupport; import java.util.Iterator; +import org.eclipse.cdt.internal.corext.fix.LinkedProposalModel; +import org.eclipse.cdt.internal.corext.fix.LinkedProposalPositionGroup; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.editor.EditorHighlightingSynchronizer; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.ICCompletionProposal; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -29,10 +35,10 @@ import org.eclipse.jface.text.contentassist.IContextInformation; import org.eclipse.jface.text.link.ILinkedModeListener; import org.eclipse.jface.text.link.LinkedModeModel; import org.eclipse.jface.text.link.LinkedModeUI; +import org.eclipse.jface.text.link.LinkedModeUI.ExitFlags; import org.eclipse.jface.text.link.LinkedPosition; import org.eclipse.jface.text.link.LinkedPositionGroup; import org.eclipse.jface.text.link.ProposalPosition; -import org.eclipse.jface.text.link.LinkedModeUI.ExitFlags; import org.eclipse.swt.events.VerifyEvent; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; @@ -41,15 +47,6 @@ import org.eclipse.text.edits.TextEdit; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.texteditor.link.EditorLinkedModeUI; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.ICCompletionProposal; - -import org.eclipse.cdt.internal.corext.fix.LinkedProposalModel; -import org.eclipse.cdt.internal.corext.fix.LinkedProposalPositionGroup; - -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.editor.EditorHighlightingSynchronizer; - /** * Does the setup of the linked mode from a {@link LinkedProposalModel} */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/MemberFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/MemberFilter.java index 0b70ff04882..5cf414eba42 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/MemberFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/MemberFilter.java @@ -14,15 +14,14 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.viewsupport; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.viewers.ViewerFilter; - import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.IDeclaration; import org.eclipse.cdt.core.model.IField; import org.eclipse.cdt.core.model.IMember; import org.eclipse.cdt.core.model.ISourceReference; import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.viewers.ViewerFilter; /** * Filter for the methods viewer. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/MemberFilterAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/MemberFilterAction.java index 18c2e1dc16d..da4d6d05466 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/MemberFilterAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/MemberFilterAction.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.viewsupport; +import org.eclipse.cdt.ui.actions.MemberFilterActionGroup; import org.eclipse.jface.action.Action; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.ui.actions.MemberFilterActionGroup; - /** * Action used to enable / disable method filter properties */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java index 97f46b99e09..9c90653bcd3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java @@ -17,6 +17,15 @@ package org.eclipse.cdt.internal.ui.viewsupport; import java.util.HashMap; import java.util.Map; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ISourceRange; +import org.eclipse.cdt.core.model.ISourceReference; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.internal.ui.util.IProblemChangedListener; +import org.eclipse.cdt.internal.ui.util.ImageDescriptorRegistry; +import org.eclipse.cdt.ui.CElementImageDescriptor; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceStatus; @@ -34,17 +43,6 @@ import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.ui.texteditor.MarkerUtilities; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ISourceRange; -import org.eclipse.cdt.core.model.ISourceReference; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CElementImageDescriptor; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.internal.ui.util.IProblemChangedListener; -import org.eclipse.cdt.internal.ui.util.ImageDescriptorRegistry; - /** * LabelDecorator that decorates an element's image with error and warning overlays that * represent the severity of markers attached to the element's underlying resource. To see diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProjectTemplateStore.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProjectTemplateStore.java index 8d57219bd64..01459df915c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProjectTemplateStore.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProjectTemplateStore.java @@ -20,6 +20,7 @@ import java.io.StringWriter; import java.util.HashSet; import java.util.Set; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ProjectScope; import org.eclipse.core.runtime.Assert; @@ -29,8 +30,6 @@ import org.eclipse.jface.text.templates.persistence.TemplateReaderWriter; import org.eclipse.jface.text.templates.persistence.TemplateStore; import org.eclipse.ui.preferences.ScopedPreferenceStore; -import org.eclipse.cdt.ui.CUIPlugin; - /** * @since 5.0 */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/SelectionListenerWithASTManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/SelectionListenerWithASTManager.java index 14dce94b7e6..0bcab5882c5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/SelectionListenerWithASTManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/SelectionListenerWithASTManager.java @@ -17,6 +17,12 @@ package org.eclipse.cdt.internal.ui.viewsupport; import java.util.HashMap; import java.util.Map; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; +import org.eclipse.cdt.internal.ui.editor.ASTProvider; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.ListenerList; @@ -31,15 +37,6 @@ import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.ui.ISelectionListener; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; - -import org.eclipse.cdt.internal.ui.editor.ASTProvider; - /** * Infrastructure to share an AST for editor post selection listeners. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StandardCElementLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StandardCElementLabelProvider.java index 8134274f466..9175ea2cdc3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StandardCElementLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StandardCElementLabelProvider.java @@ -14,10 +14,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.viewsupport; -import org.eclipse.jface.util.PropertyChangeEvent; - import org.eclipse.cdt.ui.CElementLabelProvider; import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.jface.util.PropertyChangeEvent; /** * CElementLabelProvider that respects settings from the Appearance preference page. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StatusBarUpdater.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StatusBarUpdater.java index 0bce2b19938..4ce8411e491 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StatusBarUpdater.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StatusBarUpdater.java @@ -14,8 +14,6 @@ package org.eclipse.cdt.internal.ui.viewsupport; import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; - import org.eclipse.cdt.internal.ui.CUIMessages; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IResource; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StorageLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StorageLabelProvider.java index a43d3f4930d..79d74e8e82b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StorageLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StorageLabelProvider.java @@ -19,12 +19,9 @@ import java.util.Map; import org.eclipse.core.resources.IStorage; import org.eclipse.core.runtime.IPath; - -import org.eclipse.swt.graphics.Image; - import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.LabelProvider; - +import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IEditorRegistry; import org.eclipse.ui.IFileEditorMapping; import org.eclipse.ui.PlatformUI; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/WorkingSetFilterUI.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/WorkingSetFilterUI.java index a3415fe12ee..98b832dd589 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/WorkingSetFilterUI.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/WorkingSetFilterUI.java @@ -17,6 +17,7 @@ package org.eclipse.cdt.internal.ui.viewsupport; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.core.model.ICElement; import org.eclipse.core.runtime.IPath; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; @@ -28,8 +29,6 @@ import org.eclipse.ui.IWorkingSetManager; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.WorkingSetFilterActionGroup; -import org.eclipse.cdt.core.model.ICElement; - /** * Wraps {@link WorkingSetFilterActionGroup} and handles the property changed * events diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/AbstractOpenWizardAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/AbstractOpenWizardAction.java index 631b674d154..cc86cca7039 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/AbstractOpenWizardAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/AbstractOpenWizardAction.java @@ -15,6 +15,8 @@ package org.eclipse.cdt.internal.ui.wizards; import java.util.Iterator; +import org.eclipse.cdt.internal.ui.util.ExceptionHandler; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; @@ -39,10 +41,6 @@ import org.eclipse.ui.IWorkbenchWindowActionDelegate; import org.eclipse.ui.IWorkbenchWizard; import org.eclipse.ui.actions.NewProjectAction; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.util.ExceptionHandler; - public abstract class AbstractOpenWizardAction extends Action implements IWorkbenchWindowActionDelegate { private Class<?>[] fActivatedOnTypes; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CDTProjectWizard2.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CDTProjectWizard2.java index 2aec3d2139f..679fa315983 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CDTProjectWizard2.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CDTProjectWizard2.java @@ -12,6 +12,7 @@ package org.eclipse.cdt.internal.ui.wizards; import java.net.URI; +import org.eclipse.cdt.ui.wizards.CDTCommonProjectWizard; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; @@ -23,8 +24,6 @@ import org.eclipse.tools.templates.core.IGenerator; import org.eclipse.tools.templates.ui.TemplateWizard; import org.eclipse.ui.IWorkbench; -import org.eclipse.cdt.ui.wizards.CDTCommonProjectWizard; - public class CDTProjectWizard2 extends TemplateWizard implements IGenerator, ICDTCommonProjectWizard { private final CDTCommonProjectWizard cdtWizard; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CWizardRegistry.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CWizardRegistry.java index 0d6e02185ee..1284b7bdc81 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CWizardRegistry.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CWizardRegistry.java @@ -17,6 +17,7 @@ package org.eclipse.cdt.internal.ui.wizards; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.Platform; @@ -25,8 +26,6 @@ import org.eclipse.ui.IPluginContribution; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.activities.WorkbenchActivityHelper; -import org.eclipse.cdt.ui.CUIPlugin; - /** * Convenience class for drop-in C/C++ Wizard contributions. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewClassCreationWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewClassCreationWizard.java index ac566e0372b..12897a2b224 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewClassCreationWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewClassCreationWizard.java @@ -13,16 +13,14 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.wizards; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.internal.ui.wizards.classwizard.NewClassWizardMessages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.wizards.NewClassCreationWizardPage; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.wizards.NewClassCreationWizardPage; - -import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.internal.ui.wizards.classwizard.NewClassWizardMessages; - public class NewClassCreationWizard extends NewElementWizard { private NewClassCreationWizardPage fPage; private String className; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewElementWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewElementWizard.java index eb0278bebe7..8d384ddeb0b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewElementWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewElementWizard.java @@ -15,6 +15,9 @@ package org.eclipse.cdt.internal.ui.wizards; import java.lang.reflect.InvocationTargetException; +import org.eclipse.cdt.internal.ui.actions.WorkbenchRunnableAdapter; +import org.eclipse.cdt.internal.ui.util.ExceptionHandler; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspaceRunnable; @@ -34,11 +37,6 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.ide.IDE; import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.actions.WorkbenchRunnableAdapter; -import org.eclipse.cdt.internal.ui.util.ExceptionHandler; - public abstract class NewElementWizard extends Wizard implements INewWizard { private IWorkbench fWorkbench; private IStructuredSelection fSelection; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/SourceFolderSelectionDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/SourceFolderSelectionDialog.java index bac5ecbbb28..72aeccebebf 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/SourceFolderSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/SourceFolderSelectionDialog.java @@ -14,22 +14,20 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.wizards; -import org.eclipse.jface.viewers.ILabelProvider; -import org.eclipse.jface.viewers.ITreeContentProvider; -import org.eclipse.jface.viewers.ViewerFilter; -import org.eclipse.jface.viewers.ViewerSorter; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.dialogs.ElementTreeSelectionDialog; - import org.eclipse.cdt.core.model.ICContainer; import org.eclipse.cdt.core.model.ICModel; import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator; +import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter; import org.eclipse.cdt.ui.CElementContentProvider; import org.eclipse.cdt.ui.CElementLabelProvider; import org.eclipse.cdt.ui.CElementSorter; - -import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator; -import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter; +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.ViewerFilter; +import org.eclipse.jface.viewers.ViewerSorter; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.dialogs.ElementTreeSelectionDialog; public class SourceFolderSelectionDialog extends ElementTreeSelectionDialog { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/AbstractMethodStub.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/AbstractMethodStub.java index 507930f2c75..d3e9a12f78f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/AbstractMethodStub.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/AbstractMethodStub.java @@ -14,10 +14,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.wizards.classwizard; -import org.eclipse.core.runtime.CoreException; - import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; +import org.eclipse.core.runtime.CoreException; public abstract class AbstractMethodStub implements IMethodStub { protected String fName; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/BaseClassesLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/BaseClassesLabelProvider.java index 649854ce292..fc200736fd4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/BaseClassesLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/BaseClassesLabelProvider.java @@ -13,13 +13,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.wizards.classwizard; +import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; +import org.eclipse.cdt.ui.browser.typeinfo.TypeInfoLabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.swt.graphics.Image; -import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; -import org.eclipse.cdt.ui.browser.typeinfo.TypeInfoLabelProvider; - public final class BaseClassesLabelProvider implements ITableLabelProvider { private static final String YES_VALUE = NewClassWizardMessages.BaseClassesLabelProvider_boolean_yes_label; private static final String NO_VALUE = NewClassWizardMessages.BaseClassesLabelProvider_boolean_no_label; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/BaseClassesListDialogField.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/BaseClassesListDialogField.java index bb2be1d1fe8..3856e343367 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/BaseClassesListDialogField.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/BaseClassesListDialogField.java @@ -16,6 +16,9 @@ package org.eclipse.cdt.internal.ui.wizards.classwizard; import java.util.List; +import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.ColumnLayoutData; import org.eclipse.jface.viewers.ColumnWeightData; @@ -29,11 +32,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Item; import org.eclipse.swt.widgets.Table; -import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; - -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; - public class BaseClassesListDialogField extends ListDialogField<IBaseClassInfo> { // column properties diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/ConstructorMethodStub.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/ConstructorMethodStub.java index 2a99fe4db97..fad372aeff6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/ConstructorMethodStub.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/ConstructorMethodStub.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.wizards.classwizard; -import org.eclipse.core.runtime.CoreException; - import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; import org.eclipse.cdt.ui.CodeGeneration; +import org.eclipse.core.runtime.CoreException; public final class ConstructorMethodStub extends AbstractMethodStub { private static String NAME = NewClassWizardMessages.NewClassCodeGeneration_stub_constructor_name; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/DestructorMethodStub.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/DestructorMethodStub.java index f17bef00ba9..13a7c89acfa 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/DestructorMethodStub.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/DestructorMethodStub.java @@ -14,11 +14,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.wizards.classwizard; -import org.eclipse.core.runtime.CoreException; - import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; import org.eclipse.cdt.ui.CodeGeneration; +import org.eclipse.core.runtime.CoreException; public final class DestructorMethodStub extends AbstractMethodStub { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/IMethodStub.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/IMethodStub.java index cb53e612d03..9026edc9ff6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/IMethodStub.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/IMethodStub.java @@ -14,10 +14,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.wizards.classwizard; -import org.eclipse.core.runtime.CoreException; - import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; +import org.eclipse.core.runtime.CoreException; public interface IMethodStub { public String getName(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/MethodStubsLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/MethodStubsLabelProvider.java index ea923a19d2e..22e9e26514e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/MethodStubsLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/MethodStubsLabelProvider.java @@ -13,16 +13,14 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.wizards.classwizard; +import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.swt.graphics.Image; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; - public final class MethodStubsLabelProvider implements ITableLabelProvider { /* diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/MethodStubsListDialogField.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/MethodStubsListDialogField.java index bc32af05271..8b6b2aea2c3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/MethodStubsListDialogField.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/MethodStubsListDialogField.java @@ -16,6 +16,10 @@ package org.eclipse.cdt.internal.ui.wizards.classwizard; import java.util.List; +import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.CheckedListDialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.ColumnLayoutData; import org.eclipse.jface.viewers.ColumnWeightData; @@ -29,12 +33,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Item; import org.eclipse.swt.widgets.Table; -import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; - -import org.eclipse.cdt.internal.ui.wizards.dialogfields.CheckedListDialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; - public class MethodStubsListDialogField extends CheckedListDialogField<IMethodStub> { // column properties private static final String CP_NAME = "name"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewBaseClassSelectionDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewBaseClassSelectionDialog.java index 52dca8ae5db..4c2ffe403de 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewBaseClassSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewBaseClassSelectionDialog.java @@ -20,7 +20,6 @@ import java.util.List; import org.eclipse.cdt.core.browser.ITypeInfo; import org.eclipse.cdt.core.model.ICElement; - import org.eclipse.cdt.internal.ui.browser.opentype.ElementSelectionDialog; import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; import org.eclipse.core.runtime.IStatus; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java index ecd89848afb..d8d840bc140 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java @@ -24,26 +24,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.SubMonitor; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.Document; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IRegion; -import org.eclipse.text.edits.DeleteEdit; -import org.eclipse.text.edits.MalformedTreeException; -import org.eclipse.text.edits.MultiTextEdit; -import org.eclipse.text.edits.TextEdit; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.browser.IQualifiedTypeName; import org.eclipse.cdt.core.browser.ITypeReference; @@ -62,10 +42,6 @@ import org.eclipse.cdt.core.model.IWorkingCopy; import org.eclipse.cdt.core.parser.IScannerInfo; import org.eclipse.cdt.core.parser.IScannerInfoProvider; import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.CodeGeneration; -import org.eclipse.cdt.utils.PathUtil; - import org.eclipse.cdt.internal.corext.codemanipulation.IncludeInfo; import org.eclipse.cdt.internal.corext.codemanipulation.InclusionContext; import org.eclipse.cdt.internal.corext.codemanipulation.StubUtility; @@ -75,10 +51,31 @@ import org.eclipse.cdt.internal.corext.util.CodeFormatterUtil; import org.eclipse.cdt.internal.corext.util.Strings; import org.eclipse.cdt.internal.formatter.scanner.Scanner; import org.eclipse.cdt.internal.formatter.scanner.Token; - import org.eclipse.cdt.internal.ui.refactoring.includes.IncludeGroupStyle; import org.eclipse.cdt.internal.ui.refactoring.includes.IncludePreferences; import org.eclipse.cdt.internal.ui.wizards.filewizard.NewSourceFileGenerator; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.CodeGeneration; +import org.eclipse.cdt.utils.PathUtil; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IWorkspaceRoot; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.SubMonitor; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.Document; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IRegion; +import org.eclipse.text.edits.DeleteEdit; +import org.eclipse.text.edits.MalformedTreeException; +import org.eclipse.text.edits.MultiTextEdit; +import org.eclipse.text.edits.TextEdit; public class NewClassCodeGenerator { private final IPath fHeaderPath; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardUtil.java index 4a0317bcedb..2be196207b4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardUtil.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardUtil.java @@ -17,23 +17,6 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.wizards.classwizard; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.operation.IRunnableContext; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.views.contentoutline.ContentOutline; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.browser.IQualifiedTypeName; import org.eclipse.cdt.core.browser.ITypeInfo; @@ -57,10 +40,25 @@ import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ISourceRoot; import org.eclipse.cdt.core.parser.Keywords; -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.cdt.internal.ui.viewsupport.IViewPartInputProvider; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IWorkspaceRoot; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.jface.operation.IRunnableContext; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IWorkbenchPart; +import org.eclipse.ui.views.contentoutline.ContentOutline; public class NewClassWizardUtil { /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/SourceFileSelectionDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/SourceFileSelectionDialog.java index 451f2bf44fc..45f497ed471 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/SourceFileSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/SourceFileSelectionDialog.java @@ -15,6 +15,25 @@ package org.eclipse.cdt.internal.ui.wizards.classwizard; import java.util.ArrayList; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICContainer; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICElementVisitor; +import org.eclipse.cdt.core.model.ICModel; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.corext.util.CModelUtil; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; +import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringDialogField; +import org.eclipse.cdt.ui.CElementContentProvider; +import org.eclipse.cdt.ui.CElementLabelProvider; +import org.eclipse.cdt.ui.CElementSorter; +import org.eclipse.cdt.utils.PathUtil; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspaceRoot; @@ -47,28 +66,6 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Tree; import org.eclipse.ui.dialogs.SelectionStatusDialog; -import org.eclipse.cdt.utils.PathUtil; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICContainer; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICElementVisitor; -import org.eclipse.cdt.core.model.ICModel; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CElementContentProvider; -import org.eclipse.cdt.ui.CElementLabelProvider; -import org.eclipse.cdt.ui.CElementSorter; - -import org.eclipse.cdt.internal.corext.util.CModelUtil; - -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; -import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringDialogField; - public class SourceFileSelectionDialog extends SelectionStatusDialog { TreeViewer fViewer; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/ListDialogField.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/ListDialogField.java index ad8b69e2f3c..b70848e6b2e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/ListDialogField.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/ListDialogField.java @@ -17,6 +17,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.eclipse.cdt.internal.ui.util.SWTUtil; +import org.eclipse.cdt.internal.ui.util.TableLayoutComposite; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.layout.PixelConverter; import org.eclipse.jface.viewers.ColumnLayoutData; @@ -49,9 +51,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.cdt.internal.ui.util.SWTUtil; -import org.eclipse.cdt.internal.ui.util.TableLayoutComposite; - /** * A list with a button bar. * Typical buttons are 'Add', 'Remove', 'Up' and 'Down'. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/SelectionButtonDialogField.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/SelectionButtonDialogField.java index 4bf31d3c2a6..81b65e2f043 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/SelectionButtonDialogField.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/SelectionButtonDialogField.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.wizards.dialogfields; +import org.eclipse.cdt.internal.ui.util.SWTUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; @@ -21,8 +22,6 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.cdt.internal.ui.util.SWTUtil; - /** * Dialog Field containing a single button such as a radio or checkbox button. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/SelectionButtonDialogFieldGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/SelectionButtonDialogFieldGroup.java index 44f567d397f..5eaa62d4b30 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/SelectionButtonDialogFieldGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/SelectionButtonDialogFieldGroup.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.wizards.dialogfields; +import org.eclipse.core.runtime.Assert; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; @@ -24,8 +25,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; -import org.eclipse.core.runtime.Assert; - /** * Dialog field describing a group with buttons (Checkboxes, radio buttons..) */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/Separator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/Separator.java index b5094c11d29..bbaccec9bea 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/Separator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/Separator.java @@ -14,12 +14,11 @@ package org.eclipse.cdt.internal.ui.wizards.dialogfields; import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.layout.GridData; - /** * Dialog field describing a separator. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/StringButtonDialogField.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/StringButtonDialogField.java index 7f96fb38ffb..52413ff8541 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/StringButtonDialogField.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/StringButtonDialogField.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.wizards.dialogfields; +import org.eclipse.cdt.internal.ui.util.SWTUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; @@ -23,8 +24,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.internal.ui.util.SWTUtil; - /** * Dialog field containing a label, text control and a button control. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/TreeListDialogField.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/TreeListDialogField.java index bb6ce3747d0..a28325dca17 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/TreeListDialogField.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/TreeListDialogField.java @@ -18,6 +18,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.eclipse.cdt.internal.ui.util.SWTUtil; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.layout.PixelConverter; import org.eclipse.jface.viewers.DoubleClickEvent; @@ -47,8 +48,6 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Tree; -import org.eclipse.cdt.internal.ui.util.SWTUtil; - /** * A list with a button bar. Typical buttons are 'Add', 'Remove', 'Up' and * 'Down'. List model is independent of widget creation. DialogFields controls diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizard.java index 7fef2288433..94d5cc5f7be 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizard.java @@ -14,17 +14,15 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.wizards.filewizard; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.internal.ui.wizards.NewElementWizard; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.internal.ui.wizards.NewElementWizard; - public abstract class AbstractFileCreationWizard extends NewElementWizard { protected AbstractFileCreationWizardPage fPage; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizardPage.java index 552513e55d9..d2b60d853ba 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizardPage.java @@ -19,6 +19,30 @@ package org.eclipse.cdt.internal.ui.wizards.filewizard; import java.util.HashMap; import java.util.Map; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICContainer; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ISourceRoot; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.corext.util.CModelUtil; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.preferences.CodeTemplatePreferencePage; +import org.eclipse.cdt.internal.ui.viewsupport.IViewPartInputProvider; +import org.eclipse.cdt.internal.ui.wizards.NewElementWizardPage; +import org.eclipse.cdt.internal.ui.wizards.SourceFolderSelectionDialog; +import org.eclipse.cdt.internal.ui.wizards.classwizard.NewClassWizardUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ComboDialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IStringButtonAdapter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.Separator; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringButtonDialogField; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.utils.PathUtil; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -55,33 +79,6 @@ import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.dialogs.PreferencesUtil; import org.eclipse.ui.views.contentoutline.ContentOutline; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICContainer; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ISourceRoot; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.utils.PathUtil; - -import org.eclipse.cdt.internal.corext.util.CModelUtil; - -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.preferences.CodeTemplatePreferencePage; -import org.eclipse.cdt.internal.ui.viewsupport.IViewPartInputProvider; -import org.eclipse.cdt.internal.ui.wizards.NewElementWizardPage; -import org.eclipse.cdt.internal.ui.wizards.SourceFolderSelectionDialog; -import org.eclipse.cdt.internal.ui.wizards.classwizard.NewClassWizardUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ComboDialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IStringButtonAdapter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.Separator; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringButtonDialogField; - public abstract class AbstractFileCreationWizardPage extends NewElementWizardPage { private static final int MAX_FIELD_CHARS = 50; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewFileFromTemplateWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewFileFromTemplateWizard.java index 7925009f71f..f98c29e4969 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewFileFromTemplateWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewFileFromTemplateWizard.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.wizards.filewizard; +import org.eclipse.cdt.internal.ui.CPluginImages; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; @@ -30,8 +31,6 @@ import org.eclipse.ui.dialogs.WizardNewFileCreationPage; import org.eclipse.ui.ide.IDE; import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard; -import org.eclipse.cdt.internal.ui.CPluginImages; - /** * A generic new file wizard with support for file templates. * Based on {@link org.eclipse.ui.wizards.newresource.BasicNewFileResourceWizard BasicNewFileResourceWizard}. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewHeaderFileCreationWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewHeaderFileCreationWizardPage.java index 57b0400c96c..4414df6b71a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewHeaderFileCreationWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewHeaderFileCreationWizardPage.java @@ -19,16 +19,14 @@ import org.eclipse.cdt.core.CConventions; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CodeGeneration; - import org.eclipse.cdt.internal.core.model.CProject; import org.eclipse.cdt.internal.corext.codemanipulation.StubUtility; - import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringDialogField; +import org.eclipse.cdt.ui.CodeGeneration; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewSourceFileCreationWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewSourceFileCreationWizardPage.java index 5c54b18c9c7..9f43b29ba5b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewSourceFileCreationWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewSourceFileCreationWizardPage.java @@ -16,6 +16,19 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.wizards.filewizard; +import org.eclipse.cdt.core.CConventions; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.core.model.CProject; +import org.eclipse.cdt.internal.corext.codemanipulation.StubUtility; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringDialogField; +import org.eclipse.cdt.ui.CodeGeneration; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -31,22 +44,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.core.CConventions; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CodeGeneration; - -import org.eclipse.cdt.internal.core.model.CProject; -import org.eclipse.cdt.internal.corext.codemanipulation.StubUtility; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringDialogField; - public class NewSourceFileCreationWizardPage extends AbstractFileCreationWizardPage { private final String KEY_LAST_USED_TEMPLATE = "LastUsedSourceTemplate"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewSourceFileGenerator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewSourceFileGenerator.java index 5ffef30bd54..6f2cfba0a28 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewSourceFileGenerator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewSourceFileGenerator.java @@ -18,11 +18,9 @@ package org.eclipse.cdt.internal.ui.wizards.filewizard; import java.io.ByteArrayInputStream; import java.io.InputStream; +import org.eclipse.cdt.internal.ui.util.NameComposer; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.PreferenceConstants; - -import org.eclipse.cdt.internal.ui.util.NameComposer; - import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceStatus; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/WizardNewFileFromTemplateCreationPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/WizardNewFileFromTemplateCreationPage.java index 2d4366aa8ed..cebda1487ff 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/WizardNewFileFromTemplateCreationPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/WizardNewFileFromTemplateCreationPage.java @@ -22,6 +22,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.eclipse.cdt.internal.corext.codemanipulation.StubUtility; +import org.eclipse.cdt.internal.corext.template.c.FileTemplateContextType; +import org.eclipse.cdt.internal.ui.preferences.CodeTemplatePreferencePage; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; @@ -48,11 +51,6 @@ import org.eclipse.swt.widgets.Event; import org.eclipse.ui.dialogs.PreferencesUtil; import org.eclipse.ui.dialogs.WizardNewFileCreationPage; -import org.eclipse.cdt.internal.corext.codemanipulation.StubUtility; -import org.eclipse.cdt.internal.corext.template.c.FileTemplateContextType; - -import org.eclipse.cdt.internal.ui.preferences.CodeTemplatePreferencePage; - /** * A new file creation wizard page with support for templates. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java index 42edfe4f1d6..479ecc72d5c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java @@ -17,6 +17,33 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.Set; +import org.eclipse.cdt.core.CCProjectNature; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.CProjectNature; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICModelStatus; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.IPathEntry; +import org.eclipse.cdt.core.model.ISourceRoot; +import org.eclipse.cdt.internal.core.model.InternalCoreModelUtil; +import org.eclipse.cdt.internal.core.model.PathEntryManager; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator; +import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter; +import org.eclipse.cdt.internal.ui.util.CoreUtility; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.internal.ui.wizards.NewElementWizardPage; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IStringButtonAdapter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringButtonDialogField; +import org.eclipse.cdt.ui.CElementLabelProvider; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -46,36 +73,6 @@ import org.eclipse.ui.model.WorkbenchContentProvider; import org.eclipse.ui.model.WorkbenchLabelProvider; import org.eclipse.ui.views.navigator.ResourceComparator; -import org.eclipse.cdt.core.CCProjectNature; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.CProjectNature; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICModelStatus; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.IPathEntry; -import org.eclipse.cdt.core.model.ISourceRoot; -import org.eclipse.cdt.ui.CElementLabelProvider; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.core.model.InternalCoreModelUtil; -import org.eclipse.cdt.internal.core.model.PathEntryManager; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator; -import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter; -import org.eclipse.cdt.internal.ui.util.CoreUtility; -import org.eclipse.cdt.internal.ui.util.EditorUtility; -import org.eclipse.cdt.internal.ui.wizards.NewElementWizardPage; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IStringButtonAdapter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringButtonDialogField; - public class NewSourceFolderWizardPage extends NewElementWizardPage { private static final String PAGE_NAME = "NewSourceFolderWizardPage"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/StringVariableSelectionDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/StringVariableSelectionDialog.java index e1678dfaf35..d62124ed67c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/StringVariableSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/StringVariableSelectionDialog.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.internal.ui.wizards.indexwizards; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.variables.IDynamicVariable; import org.eclipse.core.variables.IStringVariable; import org.eclipse.core.variables.VariablesPlugin; @@ -31,8 +32,6 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.dialogs.ElementListSelectionDialog; -import org.eclipse.cdt.ui.CUIPlugin; - /** * Copied from org.eclipse.debug.ui * @since 4.0 diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/TeamProjectIndexExportWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/TeamProjectIndexExportWizard.java index 817c899e0fc..6bb180eb033 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/TeamProjectIndexExportWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/TeamProjectIndexExportWizard.java @@ -14,16 +14,14 @@ package org.eclipse.cdt.internal.ui.wizards.indexwizards; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; import org.eclipse.ui.IExportWizard; import org.eclipse.ui.IWorkbench; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.CPluginImages; - public class TeamProjectIndexExportWizard extends Wizard implements IExportWizard { private static final String DIALOG_SETTINGS_SECTION = "TeamProjectIndexExportWizard"; //$NON-NLS-1$ private TeamProjectIndexExportWizardPage fMainPage; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/TeamProjectIndexExportWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/TeamProjectIndexExportWizardPage.java index 2d066dc22eb..11722d41f4f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/TeamProjectIndexExportWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/TeamProjectIndexExportWizardPage.java @@ -19,6 +19,14 @@ import java.util.Collection; import java.util.HashSet; import java.util.Iterator; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.internal.core.pdom.TeamPDOMExportOperation; +import org.eclipse.cdt.internal.core.pdom.indexer.IndexerPreferences; +import org.eclipse.cdt.internal.ui.viewsupport.ListContentProvider; +import org.eclipse.cdt.ui.CElementLabelProvider; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; @@ -50,17 +58,6 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.CElementLabelProvider; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.core.pdom.TeamPDOMExportOperation; -import org.eclipse.cdt.internal.core.pdom.indexer.IndexerPreferences; - -import org.eclipse.cdt.internal.ui.viewsupport.ListContentProvider; - public class TeamProjectIndexExportWizardPage extends WizardPage implements Listener { private static final int SIZING_TEXT_FIELD_WIDTH = 250; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/project/NewCDTProjectWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/project/NewCDTProjectWizard.java index 8c893ece77c..a644c51d92c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/project/NewCDTProjectWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/project/NewCDTProjectWizard.java @@ -10,9 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.wizards.project; -import org.eclipse.tools.templates.ui.NewWizard; - import org.eclipse.cdt.internal.ui.CUIMessages; +import org.eclipse.tools.templates.ui.NewWizard; public class NewCDTProjectWizard extends NewWizard { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ISettingsProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ISettingsProcessor.java index 91538cd5c84..d3477616075 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ISettingsProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ISettingsProcessor.java @@ -13,12 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.wizards.settingswizards; +import org.eclipse.cdt.core.settings.model.ICFolderDescription; import org.eclipse.swt.graphics.Image; import org.w3c.dom.Element; import org.xml.sax.ContentHandler; -import org.eclipse.cdt.core.settings.model.ICFolderDescription; - /** * The exported XML file is divided into 'section' elements, each * ISettingsProcessor is responsible for reading and writing diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/IncludePathsSettingsProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/IncludePathsSettingsProcessor.java index 535863f9526..261adf78e00 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/IncludePathsSettingsProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/IncludePathsSettingsProcessor.java @@ -16,18 +16,17 @@ package org.eclipse.cdt.internal.ui.wizards.settingswizards; import java.util.ArrayList; import java.util.List; -import org.eclipse.swt.graphics.Image; -import org.w3c.dom.Element; -import org.xml.sax.ContentHandler; -import org.xml.sax.SAXException; -import org.xml.sax.helpers.AttributesImpl; - import org.eclipse.cdt.core.settings.model.ICLanguageSetting; import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; import org.eclipse.cdt.core.settings.model.ICSettingEntry; import org.eclipse.cdt.core.settings.model.util.CDataUtil; import org.eclipse.cdt.ui.CDTSharedImages; import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.swt.graphics.Image; +import org.w3c.dom.Element; +import org.xml.sax.ContentHandler; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.AttributesImpl; /** * A settings processor that imports and exports include paths. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/MacroSettingsProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/MacroSettingsProcessor.java index b2a17372bd6..b52eb3b7dac 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/MacroSettingsProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/MacroSettingsProcessor.java @@ -16,6 +16,12 @@ package org.eclipse.cdt.internal.ui.wizards.settingswizards; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.core.settings.model.ICLanguageSetting; +import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; +import org.eclipse.cdt.core.settings.model.ICSettingEntry; +import org.eclipse.cdt.core.settings.model.util.CDataUtil; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.swt.graphics.Image; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -24,13 +30,6 @@ import org.w3c.dom.Text; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; -import org.eclipse.cdt.core.settings.model.ICLanguageSetting; -import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; -import org.eclipse.cdt.core.settings.model.ICSettingEntry; -import org.eclipse.cdt.core.settings.model.util.CDataUtil; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; - /** * A settings processor that imports and exports symbols. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsExportStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsExportStrategy.java index a2faa63a832..ebecc5c3d45 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsExportStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsExportStrategy.java @@ -27,6 +27,10 @@ import javax.xml.transform.sax.SAXTransformerFactory; import javax.xml.transform.sax.TransformerHandler; import javax.xml.transform.stream.StreamResult; +import org.eclipse.cdt.core.resources.ResourcesUtil; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICFolderDescription; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.filesystem.URIUtil; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; @@ -34,11 +38,6 @@ import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; -import org.eclipse.cdt.core.resources.ResourcesUtil; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICFolderDescription; -import org.eclipse.cdt.ui.CUIPlugin; - /** * Custom behavior for the Export wizard. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsImportStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsImportStrategy.java index 93312d29b8f..e95cad4f445 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsImportStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsImportStrategy.java @@ -25,6 +25,11 @@ import java.util.Map; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICFolderDescription; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.dialogs.IMessageProvider; @@ -35,12 +40,6 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICFolderDescription; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.ui.CUIPlugin; - /** * Custom behavior for the Import wizard. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsWizardPage.java index fc0863fc0b0..38402a67994 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsWizardPage.java @@ -19,6 +19,17 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.internal.ui.viewsupport.ListContentProvider; +import org.eclipse.cdt.internal.ui.wizards.settingswizards.IProjectSettingsWizardPageStrategy.MessageType; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CElementLabelProvider; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -48,19 +59,6 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CElementLabelProvider; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.viewsupport.ListContentProvider; -import org.eclipse.cdt.internal.ui.wizards.settingswizards.IProjectSettingsWizardPageStrategy.MessageType; - /** * @since 5.1 */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/SettingsProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/SettingsProcessor.java index acb79958bb6..36cc7c2f722 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/SettingsProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/SettingsProcessor.java @@ -17,15 +17,14 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.eclipse.cdt.core.settings.model.ICFolderDescription; +import org.eclipse.cdt.core.settings.model.ICLanguageSetting; +import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; import org.w3c.dom.Element; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; -import org.eclipse.cdt.core.settings.model.ICFolderDescription; -import org.eclipse.cdt.core.settings.model.ICLanguageSetting; -import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; - /** * Base class implementing standard import and export functionality * for a section of the file. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/AbstractWorkingSetConfigsContribution.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/AbstractWorkingSetConfigsContribution.java index e1751999032..388e5d372d5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/AbstractWorkingSetConfigsContribution.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/AbstractWorkingSetConfigsContribution.java @@ -18,6 +18,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.action.IContributionItem; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; @@ -26,8 +27,6 @@ import org.eclipse.ui.actions.CompoundContributionItem; import com.ibm.icu.text.Collator; -import org.eclipse.cdt.ui.CUIPlugin; - /** * Common API of dynamic contribution of items to manipulate configurations of a working set. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/AbstractWorkingSetsContribution.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/AbstractWorkingSetsContribution.java index 1975216c12a..14a75d970be 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/AbstractWorkingSetsContribution.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/AbstractWorkingSetsContribution.java @@ -17,6 +17,7 @@ package org.eclipse.cdt.internal.ui.workingsets; import java.util.Collection; import java.util.List; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.action.IContributionItem; import org.eclipse.jface.action.MenuManager; import org.eclipse.osgi.util.NLS; @@ -24,8 +25,6 @@ import org.eclipse.ui.IWorkingSet; import org.eclipse.ui.IWorkingSetManager; import org.eclipse.ui.actions.CompoundContributionItem; -import org.eclipse.cdt.ui.CUIPlugin; - /** * A dynamic contribution of sub-menus for working set configuration actions, with further sub-menus showing * the configurations to choose from. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/BuildJob.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/BuildJob.java index f44a45340c6..567946f9682 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/BuildJob.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/BuildJob.java @@ -17,6 +17,8 @@ package org.eclipse.cdt.internal.ui.workingsets; import java.util.Collection; +import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.resources.ResourcesPlugin; @@ -27,10 +29,6 @@ import org.eclipse.core.runtime.MultiStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * A job that builds a bunch of workspace projects or a working set configuration. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetPage.java index e36e8f75327..0bf1127b3cf 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetPage.java @@ -18,6 +18,20 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICContainer; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICModel; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.internal.ui.actions.SelectionConverter; +import org.eclipse.cdt.internal.ui.viewsupport.AppearanceAwareLabelProvider; +import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; +import org.eclipse.cdt.internal.ui.viewsupport.DecoratingCLabelProvider; +import org.eclipse.cdt.ui.CElementGrouping; +import org.eclipse.cdt.ui.CElementSorter; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -46,22 +60,6 @@ import org.eclipse.ui.IWorkingSetManager; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.IWorkingSetPage; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICContainer; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICModel; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.CElementGrouping; -import org.eclipse.cdt.ui.CElementSorter; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.internal.ui.actions.SelectionConverter; -import org.eclipse.cdt.internal.ui.viewsupport.AppearanceAwareLabelProvider; -import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; -import org.eclipse.cdt.internal.ui.viewsupport.DecoratingCLabelProvider; - /** * The C element working set page allows the user to create * and edit a C element working set. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetPageContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetPageContentProvider.java index 91d1473bf01..66df9c9b5b0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetPageContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetPageContentProvider.java @@ -17,13 +17,11 @@ package org.eclipse.cdt.internal.ui.workingsets; import java.util.ArrayList; import java.util.List; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IWorkspaceRoot; - import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICProject; - import org.eclipse.cdt.internal.ui.BaseCElementContentProvider; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IWorkspaceRoot; class CElementWorkingSetPageContentProvider extends BaseCElementContentProvider { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetUpdater.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetUpdater.java index 961b7c8c9ca..7e7f150c476 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetUpdater.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetUpdater.java @@ -19,6 +19,12 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ElementChangedEvent; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICElementDelta; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.IElementChangedListener; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceDelta; @@ -34,13 +40,6 @@ import org.eclipse.core.runtime.jobs.JobChangeAdapter; import org.eclipse.ui.IWorkingSet; import org.eclipse.ui.IWorkingSetUpdater; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ElementChangedEvent; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICElementDelta; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.IElementChangedListener; - public class CElementWorkingSetUpdater implements IWorkingSetUpdater, IElementChangedListener { private static class SingletonRule implements ISchedulingRule { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/IWorkingSetConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/IWorkingSetConfiguration.java index ff3f699e2f6..5a559701d48 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/IWorkingSetConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/IWorkingSetConfiguration.java @@ -16,12 +16,11 @@ package org.eclipse.cdt.internal.ui.workingsets; import java.util.Collection; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; - /** * <p> * The protocol for working set configurations. A working set configuration specifies, at a minimum, a diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/IWorkingSetProjectConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/IWorkingSetProjectConfiguration.java index 57fa6fc7826..ee1e35eea6b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/IWorkingSetProjectConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/IWorkingSetProjectConfiguration.java @@ -16,13 +16,12 @@ package org.eclipse.cdt.internal.ui.workingsets; import java.util.Collection; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; - /** * <p> * The protocol for project configurations in a working set configuration. At a minimum, the project diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/IWorkingSetProjectConfigurationFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/IWorkingSetProjectConfigurationFactory.java index 0041505bae4..17750350fcb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/IWorkingSetProjectConfigurationFactory.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/IWorkingSetProjectConfigurationFactory.java @@ -19,6 +19,9 @@ import java.util.Comparator; import java.util.Map; import java.util.Set; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.internal.ui.workingsets.WorkspaceSnapshot.ProjectState; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectNatureDescriptor; import org.eclipse.core.resources.IWorkspace; @@ -34,11 +37,6 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.osgi.util.NLS; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.workingsets.WorkspaceSnapshot.ProjectState; - /** * Protocol for a factory of {@link IWorkingSetProjectConfiguration}s. Factories are {@linkplain Registry * registered} against project natures. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/ProjectConfigurationController.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/ProjectConfigurationController.java index 1ae59001336..05b58893d97 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/ProjectConfigurationController.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/ProjectConfigurationController.java @@ -16,6 +16,9 @@ package org.eclipse.cdt.internal.ui.workingsets; import java.util.Set; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.internal.ui.workingsets.IWorkingSetProjectConfiguration.ISnapshot; +import org.eclipse.cdt.ui.CDTSharedImages; import org.eclipse.jface.resource.FontDescriptor; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.resource.LocalResourceManager; @@ -30,11 +33,6 @@ import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.model.WorkbenchLabelProvider; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.ui.CDTSharedImages; - -import org.eclipse.cdt.internal.ui.workingsets.IWorkingSetProjectConfiguration.ISnapshot; - /** * Default implementation of the working set project configuration controller protocol. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetConfigsController.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetConfigsController.java index c46c204cdd6..ee19a6f010d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetConfigsController.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetConfigsController.java @@ -18,6 +18,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Iterator; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -38,8 +39,6 @@ import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.widgets.Button; import org.eclipse.ui.IWorkingSet; -import org.eclipse.cdt.ui.CUIPlugin; - /** * The view controller for the working set configurations pane in the dialog. It takes care of coordinating * the user gestures in the pane with the working set configuration model, and vice-versa. It also implements diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetConfiguration.java index 5ded862e2f8..4cc2b0bb9a9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetConfiguration.java @@ -20,6 +20,7 @@ import static org.eclipse.cdt.internal.ui.workingsets.WorkingSetConfigurationMan import java.util.List; import java.util.Map; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -30,8 +31,6 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.ui.IMemento; import org.eclipse.ui.IWorkingSet; -import org.eclipse.cdt.ui.CUIPlugin; - /** * Default implementation of the {@link IWorkingSetConfiguration} interface. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetConfigurationBlock.java index 76bc34646a6..539a72de0bc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetConfigurationBlock.java @@ -16,6 +16,8 @@ package org.eclipse.cdt.internal.ui.workingsets; import java.util.Collection; +import org.eclipse.cdt.internal.ui.dialogs.OptionalMessageDialog; +import org.eclipse.cdt.ui.CDTSharedImages; import org.eclipse.core.resources.IProject; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; @@ -46,10 +48,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.ui.model.WorkbenchLabelProvider; -import org.eclipse.cdt.ui.CDTSharedImages; - -import org.eclipse.cdt.internal.ui.dialogs.OptionalMessageDialog; - /** * A block of UI controls for management of working set configurations. These collect the selection of project * configurations for the member projects of the working sets into named presets. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetConfigurationManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetConfigurationManager.java index acefa17e254..ac65057e1db 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetConfigurationManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetConfigurationManager.java @@ -23,6 +23,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.newui.CDTPrefUtil; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -36,9 +38,6 @@ import org.eclipse.ui.IWorkingSet; import org.eclipse.ui.IWorkingSetManager; import org.eclipse.ui.XMLMemento; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.newui.CDTPrefUtil; - /** * The purveyor of working set configurations. It provides a current view of the {@linkplain IWorkingSetProxy * working set configurations} defined in the workspace, as well as a working-copy diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetProjectConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetProjectConfiguration.java index 1c17db4b123..eaa82a43387 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetProjectConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetProjectConfiguration.java @@ -21,6 +21,10 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.resources.ResourcesPlugin; @@ -33,11 +37,6 @@ import org.eclipse.core.runtime.SubMonitor; import org.eclipse.osgi.util.NLS; import org.eclipse.ui.IMemento; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.ui.CUIPlugin; - /** * Default implementation of the {@link IWorkingSetProjectConfiguration} interface. Clients may extend this * class to implement additional project configuration settings. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetPropertyTester.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetPropertyTester.java index 6d0ac5e7376..113e73cf38d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetPropertyTester.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetPropertyTester.java @@ -14,13 +14,12 @@ package org.eclipse.cdt.internal.ui.workingsets; +import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.core.expressions.PropertyTester; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.ui.IWorkingSet; -import org.eclipse.cdt.core.model.CoreModel; - /** * Property tester for working sets that CDT can manipulate in cool ways, such * as managing build configurations. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetProxy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetProxy.java index b111a6ee00c..a4c2ed7ff37 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetProxy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetProxy.java @@ -21,6 +21,7 @@ import java.util.Collection; import java.util.Map; import java.util.Set; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.ui.IMemento; @@ -29,8 +30,6 @@ import org.eclipse.ui.IWorkingSet; import com.ibm.icu.text.UCharacterIterator; import com.ibm.icu.text.UForwardCharacterIterator; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; - /** * Default implementation of the {@link IWorkingSetProxy} interface. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkspaceSnapshot.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkspaceSnapshot.java index d89b99b016b..379e1343a51 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkspaceSnapshot.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkspaceSnapshot.java @@ -19,6 +19,10 @@ import java.util.Collection; import java.util.Collections; import java.util.Map; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.IncrementalProjectBuilder; @@ -32,11 +36,6 @@ import org.eclipse.core.runtime.SubMonitor; import org.eclipse.osgi.util.NLS; import org.eclipse.ui.IWorkingSet; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.ui.CUIPlugin; - /** * <p> * A snapshot of the working set configurations and project configurations across the workspace at the time diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CDTUITools.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CDTUITools.java index 659e700ddd7..35f794f51d5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CDTUITools.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CDTUITools.java @@ -15,6 +15,15 @@ package org.eclipse.cdt.ui; import java.net.URI; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ISourceReference; +import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.cdt.internal.ui.editor.ITranslationUnitEditorInput; +import org.eclipse.cdt.internal.ui.text.asm.AsmPartitionScanner; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.ui.text.ICPartitions; +import org.eclipse.cdt.ui.text.IColorManager; import org.eclipse.core.filebuffers.LocationKind; import org.eclipse.core.runtime.IPath; import org.eclipse.jface.text.IDocument; @@ -26,17 +35,6 @@ import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PartInitException; import org.eclipse.ui.texteditor.IDocumentProvider; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ISourceReference; -import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.ui.text.ICPartitions; -import org.eclipse.cdt.ui.text.IColorManager; - -import org.eclipse.cdt.internal.ui.editor.ITranslationUnitEditorInput; -import org.eclipse.cdt.internal.ui.text.asm.AsmPartitionScanner; -import org.eclipse.cdt.internal.ui.util.EditorUtility; - /** * This class provides utilities for clients of the CDT UI plug-in. * This class provides static methods for: diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java index f0caccb5540..fd6eb6efa9f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java @@ -16,18 +16,6 @@ package org.eclipse.cdt.ui; import java.util.HashSet; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IResourceDelta; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.ITextViewer; -import org.eclipse.jface.text.Region; -import org.eclipse.jface.text.information.IInformationProvider; -import org.eclipse.jface.text.information.IInformationProviderExtension; -import org.eclipse.jface.viewers.StructuredViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.swt.widgets.Control; -import org.eclipse.ui.texteditor.ITextEditor; - import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ElementChangedEvent; @@ -44,13 +32,22 @@ import org.eclipse.cdt.core.model.IElementChangedListener; import org.eclipse.cdt.core.model.IParent; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.model.IWorkingCopy; - import org.eclipse.cdt.internal.core.model.ArchiveContainer; import org.eclipse.cdt.internal.core.model.BinaryContainer; - import org.eclipse.cdt.internal.ui.BaseCElementContentProvider; import org.eclipse.cdt.internal.ui.actions.SelectionConverter; import org.eclipse.cdt.internal.ui.text.CWordFinder; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IResourceDelta; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.ITextViewer; +import org.eclipse.jface.text.Region; +import org.eclipse.jface.text.information.IInformationProvider; +import org.eclipse.jface.text.information.IInformationProviderExtension; +import org.eclipse.jface.viewers.StructuredViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.widgets.Control; +import org.eclipse.ui.texteditor.ITextEditor; /** * A content provider for C elements. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementImageDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementImageDescriptor.java index e5a8b403bb7..5984251f872 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementImageDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementImageDescriptor.java @@ -16,15 +16,14 @@ *******************************************************************************/ package org.eclipse.cdt.ui; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.internal.ui.viewsupport.CustomBuildSettingsDecorator; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.resource.CompositeImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.graphics.ImageData; import org.eclipse.swt.graphics.Point; -import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.internal.ui.viewsupport.CustomBuildSettingsDecorator; - /** * A CImageDescriptor consists of a base image and several adornments. The adornments * are computed according to the flags either passed during creation or set via the method diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementLabelProvider.java index 904bf11a96c..d0c64a40e36 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementLabelProvider.java @@ -15,16 +15,14 @@ *******************************************************************************/ package org.eclipse.cdt.ui; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.model.WorkbenchLabelProvider; - import org.eclipse.cdt.core.model.ICElement; - import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.model.WorkbenchLabelProvider; /** * The label provider for the c model elements. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementSorter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementSorter.java index 6a968f4313d..aa05c3896e5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementSorter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementSorter.java @@ -18,6 +18,16 @@ package org.eclipse.cdt.ui; import java.util.Comparator; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.IArchiveContainer; +import org.eclipse.cdt.core.model.IBinaryContainer; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.IIncludeReference; +import org.eclipse.cdt.core.model.ILibraryReference; +import org.eclipse.cdt.core.model.IMember; +import org.eclipse.cdt.core.model.IMethodDeclaration; +import org.eclipse.cdt.core.model.ISourceRoot; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IStorage; @@ -31,17 +41,6 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.ui.model.IWorkbenchAdapter; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.IArchiveContainer; -import org.eclipse.cdt.core.model.IBinaryContainer; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.IIncludeReference; -import org.eclipse.cdt.core.model.ILibraryReference; -import org.eclipse.cdt.core.model.IMember; -import org.eclipse.cdt.core.model.IMethodDeclaration; -import org.eclipse.cdt.core.model.ISourceRoot; - /** * A sorter to sort the file and the folders in the C viewer in the following order: * 1 Project diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java index 210d75319e3..e8d68df1d6f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java @@ -29,6 +29,39 @@ import java.util.MissingResourceException; import java.util.ResourceBundle; import java.util.Set; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.cdt.internal.core.dom.rewrite.ASTRewriteAnalyzer; +import org.eclipse.cdt.internal.core.model.IBufferFactory; +import org.eclipse.cdt.internal.corext.template.c.CContextType; +import org.eclipse.cdt.internal.corext.template.c.CodeTemplateContextType; +import org.eclipse.cdt.internal.corext.template.c.CommentContextType; +import org.eclipse.cdt.internal.corext.template.c.DocCommentContextType; +import org.eclipse.cdt.internal.corext.template.c.FileTemplateContextType; +import org.eclipse.cdt.internal.ui.CElementAdapterFactory; +import org.eclipse.cdt.internal.ui.CUIMessages; +import org.eclipse.cdt.internal.ui.ICStatusConstants; +import org.eclipse.cdt.internal.ui.IContextMenuConstants; +import org.eclipse.cdt.internal.ui.ResourceAdapterFactory; +import org.eclipse.cdt.internal.ui.buildconsole.BuildConsoleManager; +import org.eclipse.cdt.internal.ui.buildconsole.GlobalBuildConsoleManager; +import org.eclipse.cdt.internal.ui.editor.ASTProvider; +import org.eclipse.cdt.internal.ui.editor.CDocumentProvider; +import org.eclipse.cdt.internal.ui.editor.WorkingCopyManager; +import org.eclipse.cdt.internal.ui.preferences.BuildConsolePreferencePage; +import org.eclipse.cdt.internal.ui.refactoring.CTextFileChangeFactory; +import org.eclipse.cdt.internal.ui.text.CTextTools; +import org.eclipse.cdt.internal.ui.text.c.hover.CEditorTextHoverDescriptor; +import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference; +import org.eclipse.cdt.internal.ui.text.doctools.DocCommentOwnerManager; +import org.eclipse.cdt.internal.ui.text.doctools.EditorReopener; +import org.eclipse.cdt.internal.ui.text.folding.CFoldingStructureProviderRegistry; +import org.eclipse.cdt.internal.ui.util.ImageDescriptorRegistry; +import org.eclipse.cdt.internal.ui.util.ProblemMarkerManager; +import org.eclipse.cdt.internal.ui.util.Util; +import org.eclipse.cdt.internal.ui.viewsupport.CDTContextActivator; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; @@ -80,42 +113,6 @@ import org.osgi.framework.ServiceReference; import com.ibm.icu.text.MessageFormat; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.IWorkingCopy; - -import org.eclipse.cdt.internal.core.dom.rewrite.ASTRewriteAnalyzer; -import org.eclipse.cdt.internal.core.model.IBufferFactory; -import org.eclipse.cdt.internal.corext.template.c.CContextType; -import org.eclipse.cdt.internal.corext.template.c.CodeTemplateContextType; -import org.eclipse.cdt.internal.corext.template.c.CommentContextType; -import org.eclipse.cdt.internal.corext.template.c.DocCommentContextType; -import org.eclipse.cdt.internal.corext.template.c.FileTemplateContextType; - -import org.eclipse.cdt.internal.ui.CElementAdapterFactory; -import org.eclipse.cdt.internal.ui.CUIMessages; -import org.eclipse.cdt.internal.ui.ICStatusConstants; -import org.eclipse.cdt.internal.ui.IContextMenuConstants; -import org.eclipse.cdt.internal.ui.ResourceAdapterFactory; -import org.eclipse.cdt.internal.ui.buildconsole.BuildConsoleManager; -import org.eclipse.cdt.internal.ui.buildconsole.GlobalBuildConsoleManager; -import org.eclipse.cdt.internal.ui.editor.ASTProvider; -import org.eclipse.cdt.internal.ui.editor.CDocumentProvider; -import org.eclipse.cdt.internal.ui.editor.WorkingCopyManager; -import org.eclipse.cdt.internal.ui.preferences.BuildConsolePreferencePage; -import org.eclipse.cdt.internal.ui.refactoring.CTextFileChangeFactory; -import org.eclipse.cdt.internal.ui.text.CTextTools; -import org.eclipse.cdt.internal.ui.text.c.hover.CEditorTextHoverDescriptor; -import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference; -import org.eclipse.cdt.internal.ui.text.doctools.DocCommentOwnerManager; -import org.eclipse.cdt.internal.ui.text.doctools.EditorReopener; -import org.eclipse.cdt.internal.ui.text.folding.CFoldingStructureProviderRegistry; -import org.eclipse.cdt.internal.ui.util.ImageDescriptorRegistry; -import org.eclipse.cdt.internal.ui.util.ProblemMarkerManager; -import org.eclipse.cdt.internal.ui.util.Util; -import org.eclipse.cdt.internal.ui.viewsupport.CDTContextActivator; - /** * @noextend This class is not intended to be subclassed by clients. * @noinstantiate This class is not intended to be instantiated by clients. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPreferenceInitializer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPreferenceInitializer.java index 192e78d597b..fbf644c6dfc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPreferenceInitializer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPreferenceInitializer.java @@ -14,18 +14,6 @@ *******************************************************************************/ package org.eclipse.cdt.ui; -import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.preference.PreferenceConverter; -import org.eclipse.jface.resource.ColorRegistry; -import org.eclipse.swt.graphics.RGB; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.editors.text.EditorsUI; -import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants; -import org.eclipse.ui.texteditor.AbstractTextEditor; - -import org.eclipse.cdt.ui.newui.CDTPrefUtil; - import org.eclipse.cdt.internal.ui.ICThemeConstants; import org.eclipse.cdt.internal.ui.cview.CView; import org.eclipse.cdt.internal.ui.editor.SemanticHighlightings; @@ -35,6 +23,16 @@ import org.eclipse.cdt.internal.ui.preferences.CPluginPreferencePage; import org.eclipse.cdt.internal.ui.preferences.CodeAssistPreferencePage; import org.eclipse.cdt.internal.ui.preferences.WorkInProgressPreferencePage; import org.eclipse.cdt.internal.ui.refactoring.includes.IncludePreferences; +import org.eclipse.cdt.ui.newui.CDTPrefUtil; +import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; +import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.jface.preference.PreferenceConverter; +import org.eclipse.jface.resource.ColorRegistry; +import org.eclipse.swt.graphics.RGB; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.editors.text.EditorsUI; +import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants; +import org.eclipse.ui.texteditor.AbstractTextEditor; /** * This class implements the setting of the CUI initial preference store settings. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CodeGeneration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CodeGeneration.java index 16354932db7..b7cccc8d3ae 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CodeGeneration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CodeGeneration.java @@ -15,12 +15,10 @@ *******************************************************************************/ package org.eclipse.cdt.ui; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.text.templates.Template; - import org.eclipse.cdt.core.model.ITranslationUnit; - import org.eclipse.cdt.internal.corext.codemanipulation.StubUtility; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.text.templates.Template; /** * Class that offers access to the templates contained in the 'Code Templates' preference page. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/ICModelBasedEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/ICModelBasedEditor.java index 9ea934e0f3a..7a6f48bed56 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/ICModelBasedEditor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/ICModelBasedEditor.java @@ -10,9 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.ui; -import org.eclipse.ui.texteditor.ITextEditor; - import org.eclipse.cdt.core.model.ITranslationUnitHolder; +import org.eclipse.ui.texteditor.ITextEditor; /** * A text editor whose contents are represented by the C model. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/IWorkingCopyManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/IWorkingCopyManager.java index 1f509bf4092..cb0e2b40be4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/IWorkingCopyManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/IWorkingCopyManager.java @@ -13,14 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.ui; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.ui.IEditorInput; - import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.IProblemRequestor; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.ui.IEditorInput; /** * Interface for accessing working copies of {@code ITranslationUnit} diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/IWorkingCopyManagerExtension.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/IWorkingCopyManagerExtension.java index e06e52b0f32..9cdc257828b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/IWorkingCopyManagerExtension.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/IWorkingCopyManagerExtension.java @@ -13,9 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.ui; -import org.eclipse.ui.IEditorInput; - import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.ui.IEditorInput; /** * Extension interface for {@code IWorkingCopyManager}. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/NamespacesGrouping.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/NamespacesGrouping.java index df8f5716ab6..7c8c1effc28 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/NamespacesGrouping.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/NamespacesGrouping.java @@ -28,7 +28,6 @@ import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.IMember; import org.eclipse.cdt.core.model.INamespace; import org.eclipse.cdt.core.model.ITranslationUnit; - import org.eclipse.cdt.internal.ui.MembersGrouping; /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/PreferenceConstants.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/PreferenceConstants.java index 3c2a6fc919b..42d615b7390 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/PreferenceConstants.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/PreferenceConstants.java @@ -20,6 +20,11 @@ package org.eclipse.cdt.ui; import java.util.Locale; +import org.eclipse.cdt.core.CCorePreferenceConstants; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.internal.ui.preferences.formatter.FormatterProfileManager; +import org.eclipse.cdt.internal.ui.text.spelling.SpellCheckEngine; +import org.eclipse.cdt.ui.text.ICColorConstants; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ProjectScope; import org.eclipse.core.runtime.preferences.ConfigurationScope; @@ -32,13 +37,6 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.swt.SWT; import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants; -import org.eclipse.cdt.core.CCorePreferenceConstants; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.text.ICColorConstants; - -import org.eclipse.cdt.internal.ui.preferences.formatter.FormatterProfileManager; -import org.eclipse.cdt.internal.ui.text.spelling.SpellCheckEngine; - /** * Preference constants used in the CDT-UI preference store. Clients should only read * the CDT-UI preference store using these values. Clients are not allowed to modify diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/BuildActiveConfigMenuAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/BuildActiveConfigMenuAction.java index cc78d7078ff..217736d99cb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/BuildActiveConfigMenuAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/BuildActiveConfigMenuAction.java @@ -13,6 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.ui.actions; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.settings.model.CProjectDescriptionEvent; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.core.settings.model.ICProjectDescriptionListener; +import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager; +import org.eclipse.cdt.internal.ui.actions.ActionMessages; +import org.eclipse.cdt.internal.ui.cview.BuildGroup; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.jface.action.IAction; @@ -27,15 +34,6 @@ import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindowPulldownDelegate2; import org.eclipse.ui.actions.BuildAction; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.settings.model.CProjectDescriptionEvent; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.core.settings.model.ICProjectDescriptionListener; -import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager; - -import org.eclipse.cdt.internal.ui.actions.ActionMessages; -import org.eclipse.cdt.internal.ui.cview.BuildGroup; - /** * Implements a toolbar button that builds the active configuration * of selected projects. Also includes a menu that builds any of the diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeBuildConfigActionBase.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeBuildConfigActionBase.java index d60dac857f3..074fbdb038f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeBuildConfigActionBase.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeBuildConfigActionBase.java @@ -19,6 +19,14 @@ import java.util.Iterator; import java.util.SortedSet; import java.util.TreeSet; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.internal.ui.cview.IncludeRefContainer; +import org.eclipse.cdt.internal.ui.cview.IncludeReferenceProxy; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; @@ -37,16 +45,6 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.cview.IncludeRefContainer; -import org.eclipse.cdt.internal.ui.cview.IncludeReferenceProxy; - /** * Base class for build configuration actions. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeBuildConfigMenuAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeBuildConfigMenuAction.java index 45a4431d50c..06b6fea382e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeBuildConfigMenuAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeBuildConfigMenuAction.java @@ -13,6 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.ui.actions; +import org.eclipse.cdt.internal.ui.actions.ActionMessages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.newui.IConfigManager; +import org.eclipse.cdt.ui.newui.ManageConfigSelector; import org.eclipse.core.resources.IProject; import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.MessageDialog; @@ -24,12 +28,6 @@ import org.eclipse.swt.widgets.Menu; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindowPulldownDelegate2; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.newui.IConfigManager; -import org.eclipse.cdt.ui.newui.ManageConfigSelector; - -import org.eclipse.cdt.internal.ui.actions.ActionMessages; - /** * Action which changes active build configuration of the current project */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeConfigAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeConfigAction.java index 72798524076..b2c991296b9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeConfigAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeConfigAction.java @@ -16,13 +16,12 @@ package org.eclipse.cdt.ui.actions; import java.util.HashSet; import java.util.Iterator; -import org.eclipse.core.resources.IProject; -import org.eclipse.jface.action.Action; - import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.core.settings.model.ICProjectDescription; import org.eclipse.cdt.ui.newui.AbstractPage; import org.eclipse.cdt.ui.newui.CDTPropertyManager; +import org.eclipse.core.resources.IProject; +import org.eclipse.jface.action.Action; /** * Action which changes active build configuration of the current project to diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/CustomFiltersActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/CustomFiltersActionGroup.java index 773816704f3..94cc721f6e5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/CustomFiltersActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/CustomFiltersActionGroup.java @@ -28,6 +28,12 @@ import java.util.Stack; import java.util.StringTokenizer; import java.util.TreeSet; +import org.eclipse.cdt.core.model.ICModel; +import org.eclipse.cdt.internal.ui.filters.CustomFiltersDialog; +import org.eclipse.cdt.internal.ui.filters.FilterDescriptor; +import org.eclipse.cdt.internal.ui.filters.FilterMessages; +import org.eclipse.cdt.internal.ui.filters.NamePatternFilter; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.ContributionItem; @@ -53,14 +59,6 @@ import org.eclipse.ui.IMemento; import org.eclipse.ui.IViewPart; import org.eclipse.ui.actions.ActionGroup; -import org.eclipse.cdt.core.model.ICModel; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.filters.CustomFiltersDialog; -import org.eclipse.cdt.internal.ui.filters.FilterDescriptor; -import org.eclipse.cdt.internal.ui.filters.FilterMessages; -import org.eclipse.cdt.internal.ui.filters.NamePatternFilter; - /** * Action group to add the filter action to a view part's tool bar * menu. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/DeleteResConfigsAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/DeleteResConfigsAction.java index 257f6181443..2845b52eac0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/DeleteResConfigsAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/DeleteResConfigsAction.java @@ -17,6 +17,17 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICContainer; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.core.settings.model.ICResourceDescription; +import org.eclipse.cdt.internal.ui.actions.ActionMessages; +import org.eclipse.cdt.internal.ui.actions.DeleteResConfigsHandler; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.newui.AbstractPage; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; @@ -36,19 +47,6 @@ import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindowPulldownDelegate2; import org.eclipse.ui.dialogs.ListSelectionDialog; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICContainer; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.core.settings.model.ICResourceDescription; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.newui.AbstractPage; - -import org.eclipse.cdt.internal.ui.actions.ActionMessages; -import org.eclipse.cdt.internal.ui.actions.DeleteResConfigsHandler; - /** * Action which deletes resource description. (If resource description is missing * one from parent is normally used) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ExcludeFromBuildAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ExcludeFromBuildAction.java index 7c2d9ce3740..9dc5d753036 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ExcludeFromBuildAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ExcludeFromBuildAction.java @@ -16,6 +16,20 @@ package org.eclipse.cdt.ui.actions; import java.util.ArrayList; import java.util.Iterator; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICContainer; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.core.settings.model.ICSourceEntry; +import org.eclipse.cdt.core.settings.model.util.CDataUtil; +import org.eclipse.cdt.internal.ui.actions.ActionMessages; +import org.eclipse.cdt.internal.ui.actions.ExcludeFromBuildHandler; +import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.newui.AbstractPage; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -36,22 +50,6 @@ import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindowPulldownDelegate2; import org.eclipse.ui.dialogs.ListSelectionDialog; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICContainer; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.core.settings.model.ICSourceEntry; -import org.eclipse.cdt.core.settings.model.util.CDataUtil; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.newui.AbstractPage; - -import org.eclipse.cdt.internal.ui.actions.ActionMessages; -import org.eclipse.cdt.internal.ui.actions.ExcludeFromBuildHandler; -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * Action which excludes resources from build. * @deprecated as of CDT 8.0 now using {@link ExcludeFromBuildHandler} diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/FormatAllAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/FormatAllAction.java index a898c0578f4..124850684c0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/FormatAllAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/FormatAllAction.java @@ -19,6 +19,27 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; +import org.eclipse.cdt.core.dom.ast.gnu.cpp.GPPLanguage; +import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICContainer; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.ISourceRoot; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.corext.util.Resources; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.actions.ActionMessages; +import org.eclipse.cdt.internal.ui.actions.WorkbenchRunnableAdapter; +import org.eclipse.cdt.internal.ui.dialogs.OptionalMessageDialog; +import org.eclipse.cdt.internal.ui.text.CFormattingStrategy; +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.internal.ui.util.ExceptionHandler; +import org.eclipse.cdt.ui.CDTUITools; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.core.filebuffers.FileBuffers; import org.eclipse.core.filebuffers.ITextFileBuffer; import org.eclipse.core.filebuffers.ITextFileBufferManager; @@ -56,30 +77,6 @@ import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchSite; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.core.dom.ast.gnu.cpp.GPPLanguage; -import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICContainer; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.ISourceRoot; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CDTUITools; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.ICPartitions; - -import org.eclipse.cdt.internal.corext.util.Resources; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.actions.ActionMessages; -import org.eclipse.cdt.internal.ui.actions.WorkbenchRunnableAdapter; -import org.eclipse.cdt.internal.ui.dialogs.OptionalMessageDialog; -import org.eclipse.cdt.internal.ui.text.CFormattingStrategy; -import org.eclipse.cdt.internal.ui.util.EditorUtility; -import org.eclipse.cdt.internal.ui.util.ExceptionHandler; - /** * Formats the code of the translation units contained in the selection. * <p> diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/GenerateActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/GenerateActionGroup.java index 27ca9e17d27..b2d369aea9e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/GenerateActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/GenerateActionGroup.java @@ -18,6 +18,19 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ISourceReference; +import org.eclipse.cdt.internal.ui.IContextMenuConstants; +import org.eclipse.cdt.internal.ui.actions.ActionMessages; +import org.eclipse.cdt.internal.ui.actions.CDTQuickMenuCreator; +import org.eclipse.cdt.internal.ui.editor.AddIncludeAction; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds; +import org.eclipse.cdt.internal.ui.editor.OrganizeIncludesAction; +import org.eclipse.cdt.internal.ui.editor.SortLinesAction; +import org.eclipse.cdt.ui.refactoring.actions.GettersAndSettersAction; +import org.eclipse.cdt.ui.refactoring.actions.ImplementMethodAction; +import org.eclipse.cdt.ui.refactoring.actions.RefactoringAction; import org.eclipse.core.commands.IHandler; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.action.IAction; @@ -43,21 +56,6 @@ import org.eclipse.ui.part.Page; import org.eclipse.ui.texteditor.ITextEditorActionConstants; import org.eclipse.ui.texteditor.IUpdate; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ISourceReference; -import org.eclipse.cdt.ui.refactoring.actions.GettersAndSettersAction; -import org.eclipse.cdt.ui.refactoring.actions.ImplementMethodAction; -import org.eclipse.cdt.ui.refactoring.actions.RefactoringAction; - -import org.eclipse.cdt.internal.ui.IContextMenuConstants; -import org.eclipse.cdt.internal.ui.actions.ActionMessages; -import org.eclipse.cdt.internal.ui.actions.CDTQuickMenuCreator; -import org.eclipse.cdt.internal.ui.editor.AddIncludeAction; -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds; -import org.eclipse.cdt.internal.ui.editor.OrganizeIncludesAction; -import org.eclipse.cdt.internal.ui.editor.SortLinesAction; - /** * Action group that adds the source and generate actions to a part's context * menu and installs handlers for the corresponding global menu actions. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ManageConfigsAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ManageConfigsAction.java index 78e25e9ed77..2027fd369fa 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ManageConfigsAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ManageConfigsAction.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.ui.actions; +import org.eclipse.cdt.ui.newui.IConfigManager; +import org.eclipse.cdt.ui.newui.ManageConfigSelector; import org.eclipse.core.resources.IProject; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; @@ -24,9 +26,6 @@ import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindowPulldownDelegate2; -import org.eclipse.cdt.ui.newui.IConfigManager; -import org.eclipse.cdt.ui.newui.ManageConfigSelector; - /** * Action which lets to manage (add/remove etc.) build configurations of the project. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/MemberFilterActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/MemberFilterActionGroup.java index a0b6f74a174..17aecc4fe77 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/MemberFilterActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/MemberFilterActionGroup.java @@ -32,6 +32,13 @@ package org.eclipse.cdt.ui.actions; */ import java.util.ArrayList; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.actions.ActionMessages; +import org.eclipse.cdt.internal.ui.viewsupport.MemberFilter; +import org.eclipse.cdt.internal.ui.viewsupport.MemberFilterAction; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IToolBarManager; @@ -42,15 +49,6 @@ import org.eclipse.ui.IActionBars; import org.eclipse.ui.IMemento; import org.eclipse.ui.actions.ActionGroup; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; - -import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.actions.ActionMessages; -import org.eclipse.cdt.internal.ui.viewsupport.MemberFilter; -import org.eclipse.cdt.internal.ui.viewsupport.MemberFilterAction; - public class MemberFilterActionGroup extends ActionGroup { public static final int FILTER_NONPUBLIC = MemberFilter.FILTER_NONPUBLIC; public static final int FILTER_STATIC = MemberFilter.FILTER_STATIC; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenAction.java index 2889b73d419..e9eba17401d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenAction.java @@ -15,6 +15,18 @@ package org.eclipse.cdt.ui.actions; import java.util.Iterator; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ISourceReference; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.ICStatusConstants; +import org.eclipse.cdt.internal.ui.actions.ActionMessages; +import org.eclipse.cdt.internal.ui.actions.ActionUtil; +import org.eclipse.cdt.internal.ui.actions.OpenActionUtil; +import org.eclipse.cdt.internal.ui.actions.SelectionConverter; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.util.ExceptionHandler; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IStorage; @@ -32,20 +44,6 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.texteditor.IEditorStatusLine; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ISourceReference; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.ICStatusConstants; -import org.eclipse.cdt.internal.ui.actions.ActionMessages; -import org.eclipse.cdt.internal.ui.actions.ActionUtil; -import org.eclipse.cdt.internal.ui.actions.OpenActionUtil; -import org.eclipse.cdt.internal.ui.actions.SelectionConverter; -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.util.ExceptionHandler; - /** * This action opens a Java editor on a Java element or file. * <p> diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenViewActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenViewActionGroup.java index 8af4dde1d4d..e9f7708dc1a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenViewActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenViewActionGroup.java @@ -16,6 +16,16 @@ package org.eclipse.cdt.ui.actions; import java.util.List; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.IInclude; +import org.eclipse.cdt.internal.ui.IContextMenuConstants; +import org.eclipse.cdt.internal.ui.callhierarchy.OpenCallHierarchyAction; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds; +import org.eclipse.cdt.internal.ui.includebrowser.OpenIncludeBrowserAction; +import org.eclipse.cdt.internal.ui.search.actions.OpenDeclarationsAction; +import org.eclipse.cdt.internal.ui.typehierarchy.OpenTypeHierarchyAction; +import org.eclipse.cdt.ui.ICModelBasedEditor; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.text.ITextSelection; import org.eclipse.jface.viewers.ISelection; @@ -30,18 +40,6 @@ import org.eclipse.ui.dialogs.PropertyDialogAction; import org.eclipse.ui.part.Page; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.IInclude; -import org.eclipse.cdt.ui.ICModelBasedEditor; - -import org.eclipse.cdt.internal.ui.IContextMenuConstants; -import org.eclipse.cdt.internal.ui.callhierarchy.OpenCallHierarchyAction; -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds; -import org.eclipse.cdt.internal.ui.includebrowser.OpenIncludeBrowserAction; -import org.eclipse.cdt.internal.ui.search.actions.OpenDeclarationsAction; -import org.eclipse.cdt.internal.ui.typehierarchy.OpenTypeHierarchyAction; - /** * Action group that adds actions to open a new CDT view part or an external * viewer to a context menu and the global menu bar. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/WorkingSetConfigAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/WorkingSetConfigAction.java index 444bc5c4dc4..59d21b1f794 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/WorkingSetConfigAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/WorkingSetConfigAction.java @@ -15,6 +15,8 @@ *******************************************************************************/ package org.eclipse.cdt.ui.actions; +import org.eclipse.cdt.internal.ui.workingsets.WorkingSetConfigurationDialog; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.action.IAction; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; @@ -24,10 +26,6 @@ import org.eclipse.ui.IWorkbenchWindowActionDelegate; import org.eclipse.ui.IWorkingSet; import org.eclipse.ui.IWorkingSetManager; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.workingsets.WorkingSetConfigurationDialog; - /** */ public class WorkingSetConfigAction implements IWorkbenchWindowActionDelegate, IPropertyChangeListener { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/build/ToolChainPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/build/ToolChainPreferencePage.java index 8d468d7bad9..dd465d3e4a8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/build/ToolChainPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/build/ToolChainPreferencePage.java @@ -13,6 +13,12 @@ package org.eclipse.cdt.ui.build; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.core.build.IToolChain; +import org.eclipse.cdt.core.build.IToolChainManager; +import org.eclipse.cdt.core.build.IUserToolChainProvider; +import org.eclipse.cdt.internal.ui.CUIMessages; +import org.eclipse.cdt.internal.ui.build.NewToolChainWizard; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtension; @@ -51,14 +57,6 @@ import org.eclipse.tools.templates.ui.internal.Activator; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; -import org.eclipse.cdt.core.build.IToolChain; -import org.eclipse.cdt.core.build.IToolChainManager; -import org.eclipse.cdt.core.build.IUserToolChainProvider; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.CUIMessages; -import org.eclipse.cdt.internal.ui.build.NewToolChainWizard; - /** * Preference page to manage Toolchains for Core Build. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/build/ToolChainWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/build/ToolChainWizard.java index d99f894f91b..b92cff8597e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/build/ToolChainWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/build/ToolChainWizard.java @@ -10,9 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.ui.build; -import org.eclipse.jface.wizard.Wizard; - import org.eclipse.cdt.core.build.IToolChain; +import org.eclipse.jface.wizard.Wizard; /** * Parent class for toolChain wizards that create or edit toolchains. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractCOptionPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractCOptionPage.java index fc4de807514..398d86f3b4f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractCOptionPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractCOptionPage.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.ui.dialogs; +import org.eclipse.cdt.internal.ui.util.SWTUtil; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.dialogs.DialogPage; @@ -23,8 +24,6 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; -import org.eclipse.cdt.internal.ui.util.SWTUtil; - public abstract class AbstractCOptionPage extends DialogPage implements ICOptionPage { private boolean bIsValid = true; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java index 4ef909f8af0..ce82e16113b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java @@ -20,6 +20,15 @@ import java.util.Iterator; import java.util.List; import java.util.StringTokenizer; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.ErrorParserManager; +import org.eclipse.cdt.internal.ui.CUIMessages; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.CheckedListDialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IExtension; @@ -36,17 +45,6 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.ErrorParserManager; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.CUIMessages; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.CheckedListDialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; - public abstract class AbstractErrorParserBlock extends AbstractCOptionPage { private static final String PREFIX = "ErrorParserBlock"; //$NON-NLS-1$ private static final String LABEL = PREFIX + ".label"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractGNUBinaryParserPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractGNUBinaryParserPage.java index 25c8df75293..934ed035416 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractGNUBinaryParserPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractGNUBinaryParserPage.java @@ -16,6 +16,13 @@ package org.eclipse.cdt.ui.dialogs; import java.io.File; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.settings.model.ICConfigExtensionReference; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.internal.ui.CUIMessages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; @@ -38,15 +45,6 @@ import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.settings.model.ICConfigExtensionReference; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.utils.ui.controls.ControlFactory; - -import org.eclipse.cdt.internal.ui.CUIMessages; - /** * Abstract base binary parser page for GNU binutils based binary parsers */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractIndexerPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractIndexerPage.java index aef3bab8767..b902c499301 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractIndexerPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractIndexerPage.java @@ -18,6 +18,10 @@ package org.eclipse.cdt.ui.dialogs; import java.util.Properties; +import org.eclipse.cdt.internal.core.model.CProject; +import org.eclipse.cdt.internal.core.pdom.indexer.IndexerPreferences; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.layout.PixelConverter; @@ -35,13 +39,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.utils.ui.controls.ControlFactory; - -import org.eclipse.cdt.internal.core.model.CProject; -import org.eclipse.cdt.internal.core.pdom.indexer.IndexerPreferences; - -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; - /** * Configuration for indexer. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java index 7027adc2822..0aeb9c93126 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java @@ -20,6 +20,20 @@ import java.util.Map; import java.util.Map.Entry; import java.util.StringTokenizer; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.ICDescriptor; +import org.eclipse.cdt.core.ICDescriptorOperation; +import org.eclipse.cdt.core.settings.model.ICConfigExtensionReference; +import org.eclipse.cdt.internal.ui.CUIMessages; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.CheckedListDialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtension; @@ -37,22 +51,6 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.ICDescriptor; -import org.eclipse.cdt.core.ICDescriptorOperation; -import org.eclipse.cdt.core.settings.model.ICConfigExtensionReference; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.utils.ui.controls.ControlFactory; - -import org.eclipse.cdt.internal.ui.CUIMessages; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.CheckedListDialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; - /** * @deprecated as of CDT 4.0. This tab was used to set preferences/properties * for 3.X style projects. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CHelpConfigurationPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CHelpConfigurationPropertyPage.java index 7515af32fff..bf71b40ba87 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CHelpConfigurationPropertyPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CHelpConfigurationPropertyPage.java @@ -18,6 +18,17 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.ui.CHelpProviderManager; +import org.eclipse.cdt.internal.ui.CUIMessages; +import org.eclipse.cdt.internal.ui.text.CHelpBookDescriptor; +import org.eclipse.cdt.internal.ui.util.ImageDescriptorRegistry; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.CheckedListDialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.text.ICHelpInvocationContext; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IAdaptable; @@ -32,19 +43,6 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.dialogs.PropertyPage; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.text.ICHelpInvocationContext; - -import org.eclipse.cdt.internal.ui.CHelpProviderManager; -import org.eclipse.cdt.internal.ui.CUIMessages; -import org.eclipse.cdt.internal.ui.text.CHelpBookDescriptor; -import org.eclipse.cdt.internal.ui.util.ImageDescriptorRegistry; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.CheckedListDialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; - /** * This class defines a project property page * for C/C++ project help settings configuration diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CacheSizeBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CacheSizeBlock.java index dfec1710ade..c93344fba6b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CacheSizeBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CacheSizeBlock.java @@ -15,6 +15,10 @@ *******************************************************************************/ package org.eclipse.cdt.ui.dialogs; +import org.eclipse.cdt.core.CCorePreferenceConstants; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.layout.PixelConverter; @@ -30,12 +34,6 @@ import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.core.CCorePreferenceConstants; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.utils.ui.controls.ControlFactory; - -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; - /** * This OptionPage is used in the IndexerPreference page to allow for adjusting * various parsing related caches. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CygwinPEBinaryParserPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CygwinPEBinaryParserPage.java index 61b95fe65f1..6235cf31d60 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CygwinPEBinaryParserPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CygwinPEBinaryParserPage.java @@ -16,6 +16,13 @@ package org.eclipse.cdt.ui.dialogs; import java.io.File; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.settings.model.ICConfigExtensionReference; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.internal.ui.CUIMessages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; @@ -38,15 +45,6 @@ import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.settings.model.ICConfigExtensionReference; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.utils.ui.controls.ControlFactory; - -import org.eclipse.cdt.internal.ui.CUIMessages; - /** * @noextend This class is not intended to be subclassed by clients. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DocCommentOwnerBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DocCommentOwnerBlock.java index b2cdcb24cd2..8102a1eaa41 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DocCommentOwnerBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DocCommentOwnerBlock.java @@ -13,6 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.ui.dialogs; +import org.eclipse.cdt.internal.ui.text.doctools.DocCommentOwnerManager; +import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; +import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; @@ -27,11 +30,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Link; import org.eclipse.ui.dialogs.PreferencesUtil; -import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; -import org.eclipse.cdt.utils.ui.controls.ControlFactory; - -import org.eclipse.cdt.internal.ui.text.doctools.DocCommentOwnerManager; - /** * Project property page for setting documentation comment owner. * <em>This class is not intended for use outside of CDT</em> diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DocCommentOwnerCombo.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DocCommentOwnerCombo.java index f889018aa92..4c2422634c2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DocCommentOwnerCombo.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DocCommentOwnerCombo.java @@ -16,16 +16,14 @@ package org.eclipse.cdt.ui.dialogs; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.internal.ui.text.doctools.DocCommentOwnerManager; +import org.eclipse.cdt.internal.ui.text.doctools.NullDocCommentOwner; +import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; +import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; -import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; -import org.eclipse.cdt.utils.ui.controls.ControlFactory; - -import org.eclipse.cdt.internal.ui.text.doctools.DocCommentOwnerManager; -import org.eclipse.cdt.internal.ui.text.doctools.NullDocCommentOwner; - /** * Manages the population and selection of the doc-comment {@link Combo} box * <em>This class is not intended for use outside of CDT</em> diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DocCommentOwnerComposite.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DocCommentOwnerComposite.java index 9ed6f9f57ef..044491a05df 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DocCommentOwnerComposite.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DocCommentOwnerComposite.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.ui.dialogs; +import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; +import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; @@ -21,9 +23,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; -import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; -import org.eclipse.cdt.utils.ui.controls.ControlFactory; - /** * <em>This class is not intended for use outside of CDT</em> * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java index d7738badffb..205e50c643e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java @@ -20,6 +20,19 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.IPDOMManager; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager; +import org.eclipse.cdt.core.settings.model.ICProjectDescriptionPreferences; +import org.eclipse.cdt.core.settings.model.ICProjectDescriptionWorkspacePreferences; +import org.eclipse.cdt.internal.core.CCoreInternals; +import org.eclipse.cdt.internal.core.pdom.indexer.IndexerPreferences; +import org.eclipse.cdt.internal.ui.preferences.IndexerPreferencePage; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.utils.ui.controls.ControlFactory; +import org.eclipse.cdt.utils.ui.controls.TabFolderLayout; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; @@ -41,22 +54,6 @@ import org.eclipse.ui.dialogs.PropertyPage; import com.ibm.icu.text.Collator; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.IPDOMManager; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager; -import org.eclipse.cdt.core.settings.model.ICProjectDescriptionPreferences; -import org.eclipse.cdt.core.settings.model.ICProjectDescriptionWorkspacePreferences; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.utils.ui.controls.ControlFactory; -import org.eclipse.cdt.utils.ui.controls.TabFolderLayout; - -import org.eclipse.cdt.internal.core.CCoreInternals; -import org.eclipse.cdt.internal.core.pdom.indexer.IndexerPreferences; - -import org.eclipse.cdt.internal.ui.preferences.IndexerPreferencePage; - /** * This <code>IndexerBlock</code> is used in the <code>MakeProjectWizardOptionPage</code> and * the <code>NewManagedProjectOptionPage</code> to display the indexer options during the creation of diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerOptionPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerOptionPropertyPage.java index a3dae443aef..f8b3fac5a85 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerOptionPropertyPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerOptionPropertyPage.java @@ -15,6 +15,8 @@ *******************************************************************************/ package org.eclipse.cdt.ui.dialogs; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IAdaptable; @@ -26,10 +28,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.PropertyPage; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; - /** * @noextend This class is not intended to be subclassed by clients. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/MachOBinaryParserPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/MachOBinaryParserPage.java index 2b45c0337c4..f8b0795da83 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/MachOBinaryParserPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/MachOBinaryParserPage.java @@ -16,6 +16,13 @@ package org.eclipse.cdt.ui.dialogs; import java.io.File; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.settings.model.ICConfigExtensionReference; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.internal.ui.CUIMessages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; @@ -38,15 +45,6 @@ import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.settings.model.ICConfigExtensionReference; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.utils.ui.controls.ControlFactory; - -import org.eclipse.cdt.internal.ui.CUIMessages; - /** * @noextend This class is not intended to be subclassed by clients. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/PreferenceScopeBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/PreferenceScopeBlock.java index d12d7e83e73..ba61fa96fad 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/PreferenceScopeBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/PreferenceScopeBlock.java @@ -14,6 +14,8 @@ package org.eclipse.cdt.ui.dialogs; +import org.eclipse.cdt.utils.ui.controls.ControlFactory; +import org.eclipse.cdt.utils.ui.controls.TabFolderLayout; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -26,9 +28,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Link; import org.eclipse.ui.dialogs.PreferencesUtil; -import org.eclipse.cdt.utils.ui.controls.ControlFactory; -import org.eclipse.cdt.utils.ui.controls.TabFolderLayout; - abstract public class PreferenceScopeBlock { private Button fUseProjectSettings; private Button fStoreWithProject; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/ReferenceBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/ReferenceBlock.java index 5bddd3a32c4..6f4e7f27e8c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/ReferenceBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/ReferenceBlock.java @@ -15,6 +15,9 @@ package org.eclipse.cdt.ui.dialogs; import java.util.ArrayList; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.internal.ui.CUIMessages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; import org.eclipse.core.resources.IWorkspace; @@ -38,11 +41,6 @@ import org.eclipse.ui.ide.IDE; import org.eclipse.ui.model.WorkbenchContentProvider; import org.eclipse.ui.model.WorkbenchLabelProvider; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.CUIMessages; - /** * @deprecated as of CDT 4.0. This Block was used for New Project Wizard * for 3.X style projects. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegexErrorParserOptionPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegexErrorParserOptionPage.java index aed8499dfca..22e31359a26 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegexErrorParserOptionPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegexErrorParserOptionPage.java @@ -18,6 +18,14 @@ package org.eclipse.cdt.ui.dialogs; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.core.ErrorParserManager; +import org.eclipse.cdt.core.IErrorParserNamed; +import org.eclipse.cdt.core.IMarkerGenerator; +import org.eclipse.cdt.core.errorparsers.RegexErrorParser; +import org.eclipse.cdt.core.errorparsers.RegexErrorPattern; +import org.eclipse.cdt.internal.ui.util.SWTUtil; +import org.eclipse.cdt.internal.ui.util.TableLayoutComposite; +import org.eclipse.cdt.ui.newui.AbstractCPropertyTab; import org.eclipse.core.resources.IMarker; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; @@ -63,16 +71,6 @@ import org.eclipse.ui.fieldassist.ContentAssistCommandAdapter; import com.ibm.icu.text.MessageFormat; -import org.eclipse.cdt.core.ErrorParserManager; -import org.eclipse.cdt.core.IErrorParserNamed; -import org.eclipse.cdt.core.IMarkerGenerator; -import org.eclipse.cdt.core.errorparsers.RegexErrorParser; -import org.eclipse.cdt.core.errorparsers.RegexErrorPattern; -import org.eclipse.cdt.ui.newui.AbstractCPropertyTab; - -import org.eclipse.cdt.internal.ui.util.SWTUtil; -import org.eclipse.cdt.internal.ui.util.TableLayoutComposite; - /** * Options page for RegexErrorParser in Error Parsers Tab of properties/preferences. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegularExpressionStatusDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegularExpressionStatusDialog.java index d2f66a102b8..95e38a4ee9d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegularExpressionStatusDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegularExpressionStatusDialog.java @@ -16,6 +16,7 @@ package org.eclipse.cdt.ui.dialogs; import java.util.regex.Pattern; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.fieldassist.TextContentAdapter; import org.eclipse.jface.text.FindReplaceDocumentAdapterContentProposalProvider; @@ -24,8 +25,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.fieldassist.ContentAssistCommandAdapter; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; - /** * Input Dialog for validating regular expression syntax. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/TabFolderOptionBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/TabFolderOptionBlock.java index 565023b9dbf..7bd1059fc37 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/TabFolderOptionBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/TabFolderOptionBlock.java @@ -17,6 +17,9 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.eclipse.cdt.internal.ui.CUIMessages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.utils.ui.controls.TabFolderLayout; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; @@ -34,11 +37,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.TabFolder; import org.eclipse.swt.widgets.TabItem; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.utils.ui.controls.TabFolderLayout; - -import org.eclipse.cdt.internal.ui.CUIMessages; - public abstract class TabFolderOptionBlock { protected boolean initializingTabs = true; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/extensions/ICallHierarchyProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/extensions/ICallHierarchyProvider.java index 7112029ccf5..0f9ee90ef5f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/extensions/ICallHierarchyProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/extensions/ICallHierarchyProvider.java @@ -13,10 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.ui.extensions; -import org.eclipse.core.runtime.CoreException; - import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.core.runtime.CoreException; /** * Interface for classes implementing the org.eclipse.cdt.ui.callHierarchyProviders extension diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/extensions/IExternalSearchProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/extensions/IExternalSearchProvider.java index 05ef577c955..d6d1c6eb3c4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/extensions/IExternalSearchProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/extensions/IExternalSearchProvider.java @@ -15,13 +15,12 @@ package org.eclipse.cdt.ui.extensions; import java.util.List; -import org.eclipse.core.runtime.CoreException; - import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.index.IIndexName; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.core.runtime.CoreException; /** * Interface for classes implementing the org.eclipse.cdt.ui.externalSearchProviders extension diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/language/settings/providers/AbstractLanguageSettingProviderOptionPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/language/settings/providers/AbstractLanguageSettingProviderOptionPage.java index b78142da8c4..02b29fd9122 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/language/settings/providers/AbstractLanguageSettingProviderOptionPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/language/settings/providers/AbstractLanguageSettingProviderOptionPage.java @@ -13,15 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.ui.language.settings.providers; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; - import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvider; import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager; +import org.eclipse.cdt.internal.ui.language.settings.providers.LanguageSettingsProviderTab; import org.eclipse.cdt.ui.dialogs.AbstractCOptionPage; import org.eclipse.cdt.ui.newui.AbstractCPropertyTab; - -import org.eclipse.cdt.internal.ui.language.settings.providers.LanguageSettingsProviderTab; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; /** * Abstract class to implement language settings providers Options page. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java index 3363f5a7eed..380a73cf3de 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java @@ -18,6 +18,14 @@ package org.eclipse.cdt.ui.newui; import java.lang.reflect.Method; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.cdtvariables.ICdtVariable; +import org.eclipse.cdt.core.cdtvariables.ICdtVariableManager; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICResourceDescription; +import org.eclipse.cdt.internal.core.resources.ResourceLookup; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.newui.Messages; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -56,17 +64,6 @@ import org.eclipse.ui.model.WorkbenchLabelProvider; import org.eclipse.ui.part.PageBook; import org.eclipse.ui.views.navigator.ResourceComparator; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.cdtvariables.ICdtVariable; -import org.eclipse.cdt.core.cdtvariables.ICdtVariableManager; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICResourceDescription; - -import org.eclipse.cdt.internal.core.resources.ResourceLookup; - -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * It is a parent for all standard property tabs * in new CDT model. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractExportTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractExportTab.java index fd9ccbb7205..0cf3b39b36c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractExportTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractExportTab.java @@ -21,6 +21,17 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.LanguageManager; +import org.eclipse.cdt.core.model.util.CDTListComparator; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICExternalSetting; +import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; +import org.eclipse.cdt.core.settings.model.ICResourceDescription; +import org.eclipse.cdt.core.settings.model.ICSettingEntry; +import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.content.IContentType; @@ -44,19 +55,6 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.LanguageManager; -import org.eclipse.cdt.core.model.util.CDTListComparator; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICExternalSetting; -import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; -import org.eclipse.cdt.core.settings.model.ICResourceDescription; -import org.eclipse.cdt.core.settings.model.ICSettingEntry; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.newui.Messages; - public abstract class AbstractExportTab extends AbstractCPropertyTab { protected Table table; protected TableViewer tv; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java index c901fc4227f..971b62c0df0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java @@ -22,6 +22,29 @@ import java.util.Comparator; import java.util.LinkedList; import java.util.List; +import org.eclipse.cdt.core.language.settings.providers.ScannerDiscoveryLegacySupport; +import org.eclipse.cdt.core.model.ILanguageDescriptor; +import org.eclipse.cdt.core.model.LanguageManager; +import org.eclipse.cdt.core.model.util.CDTListComparator; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICExternalSetting; +import org.eclipse.cdt.core.settings.model.ICFileDescription; +import org.eclipse.cdt.core.settings.model.ICFolderDescription; +import org.eclipse.cdt.core.settings.model.ICLanguageSetting; +import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; +import org.eclipse.cdt.core.settings.model.ICMultiFolderDescription; +import org.eclipse.cdt.core.settings.model.ICMultiItemsHolder; +import org.eclipse.cdt.core.settings.model.ICMultiResourceDescription; +import org.eclipse.cdt.core.settings.model.ICResourceDescription; +import org.eclipse.cdt.core.settings.model.ICSettingBase; +import org.eclipse.cdt.core.settings.model.ICSettingEntry; +import org.eclipse.cdt.core.settings.model.MultiLanguageSetting; +import org.eclipse.cdt.core.settings.model.util.CDataUtil; +import org.eclipse.cdt.internal.ui.language.settings.providers.LanguageSettingsImages; +import org.eclipse.cdt.internal.ui.language.settings.providers.LanguageSettingsProvidersPage; +import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.cdt.internal.ui.newui.StatusMessageLine; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -55,31 +78,6 @@ import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeColumn; import org.eclipse.swt.widgets.TreeItem; -import org.eclipse.cdt.core.language.settings.providers.ScannerDiscoveryLegacySupport; -import org.eclipse.cdt.core.model.ILanguageDescriptor; -import org.eclipse.cdt.core.model.LanguageManager; -import org.eclipse.cdt.core.model.util.CDTListComparator; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICExternalSetting; -import org.eclipse.cdt.core.settings.model.ICFileDescription; -import org.eclipse.cdt.core.settings.model.ICFolderDescription; -import org.eclipse.cdt.core.settings.model.ICLanguageSetting; -import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; -import org.eclipse.cdt.core.settings.model.ICMultiFolderDescription; -import org.eclipse.cdt.core.settings.model.ICMultiItemsHolder; -import org.eclipse.cdt.core.settings.model.ICMultiResourceDescription; -import org.eclipse.cdt.core.settings.model.ICResourceDescription; -import org.eclipse.cdt.core.settings.model.ICSettingBase; -import org.eclipse.cdt.core.settings.model.ICSettingEntry; -import org.eclipse.cdt.core.settings.model.MultiLanguageSetting; -import org.eclipse.cdt.core.settings.model.util.CDataUtil; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.language.settings.providers.LanguageSettingsImages; -import org.eclipse.cdt.internal.ui.language.settings.providers.LanguageSettingsProvidersPage; -import org.eclipse.cdt.internal.ui.newui.Messages; -import org.eclipse.cdt.internal.ui.newui.StatusMessageLine; - public abstract class AbstractLangsListTab extends AbstractCPropertyTab { protected Table table; protected TableViewer tv; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java index 01035ccd216..56129b8b31e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java @@ -30,6 +30,24 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.util.CDTListComparator; +import org.eclipse.cdt.core.settings.model.CConfigurationStatus; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICFolderDescription; +import org.eclipse.cdt.core.settings.model.ICMultiItemsHolder; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.core.settings.model.ICResourceDescription; +import org.eclipse.cdt.core.settings.model.MultiItemsHolder; +import org.eclipse.cdt.internal.ui.dialogs.OptionalMessageDialog; +import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; @@ -84,26 +102,6 @@ import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation; import org.eclipse.ui.dialogs.PropertyPage; import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.util.CDTListComparator; -import org.eclipse.cdt.core.settings.model.CConfigurationStatus; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICFolderDescription; -import org.eclipse.cdt.core.settings.model.ICMultiItemsHolder; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.core.settings.model.ICResourceDescription; -import org.eclipse.cdt.core.settings.model.MultiItemsHolder; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.utils.ui.controls.ControlFactory; - -import org.eclipse.cdt.internal.ui.dialogs.OptionalMessageDialog; -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * It is a parent for all standard CDT property pages * in new CDT model. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPrefPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPrefPage.java index 2fada1ad1d1..38f94a6560c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPrefPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPrefPage.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.ui.newui; +import org.eclipse.cdt.core.settings.model.ICResourceDescription; +import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -23,9 +25,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; -import org.eclipse.cdt.core.settings.model.ICResourceDescription; -import org.eclipse.cdt.utils.ui.controls.ControlFactory; - /** * Abstract page to be used as base for preference pages */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractSinglePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractSinglePage.java index cf4dc0ab09a..071d4276688 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractSinglePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractSinglePage.java @@ -13,10 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.ui.newui; -import org.eclipse.swt.widgets.Composite; - import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.core.settings.model.ICResourceDescription; +import org.eclipse.swt.widgets.Composite; /** * Bug #183341 : Single property page which does not diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/BinaryParsTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/BinaryParsTab.java index 5ca1d66fe95..53c89f7c3c8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/BinaryParsTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/BinaryParsTab.java @@ -17,6 +17,17 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.model.CoreModelUtil; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICMultiResourceDescription; +import org.eclipse.cdt.core.settings.model.ICResourceDescription; +import org.eclipse.cdt.core.settings.model.ICTargetPlatformSetting; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.dialogs.ICOptionPage; +import org.eclipse.cdt.utils.ui.controls.TabFolderLayout; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtension; @@ -41,19 +52,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Table; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.model.CoreModelUtil; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICMultiResourceDescription; -import org.eclipse.cdt.core.settings.model.ICResourceDescription; -import org.eclipse.cdt.core.settings.model.ICTargetPlatformSetting; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.dialogs.ICOptionPage; -import org.eclipse.cdt.utils.ui.controls.TabFolderLayout; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * @noextend This class is not intended to be subclassed by clients. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/BuildVarListDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/BuildVarListDialog.java index 792660012ac..e15c342b6ed 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/BuildVarListDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/BuildVarListDialog.java @@ -14,6 +14,8 @@ *******************************************************************************/ package org.eclipse.cdt.ui.newui; +import org.eclipse.cdt.core.cdtvariables.ICdtVariable; +import org.eclipse.cdt.internal.ui.newui.Messages; import org.eclipse.core.variables.IStringVariable; import org.eclipse.core.variables.VariablesPlugin; import org.eclipse.jface.viewers.LabelProvider; @@ -27,9 +29,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.dialogs.ElementListSelectionDialog; -import org.eclipse.cdt.core.cdtvariables.ICdtVariable; - -import org.eclipse.cdt.internal.ui.newui.Messages; /** * Displays CDT variables dialog with ability to filter. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTPrefUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTPrefUtil.java index 4ed4d197b84..7e15cb2e43f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTPrefUtil.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTPrefUtil.java @@ -22,12 +22,10 @@ import java.util.LinkedList; import java.util.List; import java.util.TreeSet; -import org.eclipse.jface.preference.IPreferenceStore; - -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.ui.newui.Messages; import org.eclipse.cdt.internal.ui.workingsets.WorkingSetConfigurationManager; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.jface.preference.IPreferenceStore; /** * @noextend This class is not intended to be subclassed by clients. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTPropertyManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTPropertyManager.java index caeec157180..b900b0fb276 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTPropertyManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTPropertyManager.java @@ -15,6 +15,10 @@ package org.eclipse.cdt.ui.newui; import java.util.ArrayList; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.swt.events.DisposeEvent; @@ -22,12 +26,6 @@ import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.widgets.Widget; import org.eclipse.ui.dialogs.PropertyPage; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * This class is intended to handle * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTStatusInfo.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTStatusInfo.java index 03ff791ff84..8ae653f9b4a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTStatusInfo.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTStatusInfo.java @@ -13,9 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.ui.newui; -import org.eclipse.core.runtime.IStatus; - import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.runtime.IStatus; /** * Simple IStatus implementation to avoid using internal classes. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTUIListComparator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTUIListComparator.java index 2e4eb088e57..32d21b74b17 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTUIListComparator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTUIListComparator.java @@ -15,11 +15,10 @@ package org.eclipse.cdt.ui.newui; import java.util.Comparator; -import org.eclipse.core.runtime.IConfigurationElement; - import org.eclipse.cdt.core.model.util.CDTListComparator; import org.eclipse.cdt.ui.newui.AbstractExportTab.ExtData; import org.eclipse.cdt.ui.wizards.EntryDescriptor; +import org.eclipse.core.runtime.IConfigurationElement; /** * @noextend This class is not intended to be subclassed by clients. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationOutputTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationOutputTab.java index eca5bebc706..e03f40930f5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationOutputTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationOutputTab.java @@ -13,17 +13,15 @@ *******************************************************************************/ package org.eclipse.cdt.ui.newui; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.runtime.IPath; -import org.eclipse.swt.widgets.Composite; - import org.eclipse.cdt.core.settings.model.COutputEntry; import org.eclipse.cdt.core.settings.model.ICExclusionPatternPathEntry; import org.eclipse.cdt.core.settings.model.ICOutputEntry; import org.eclipse.cdt.core.settings.model.ICResourceDescription; import org.eclipse.cdt.core.settings.model.ICSettingEntry; - import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.runtime.IPath; +import org.eclipse.swt.widgets.Composite; /** * @noextend This class is not intended to be subclassed by clients. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationSourceTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationSourceTab.java index c9058cff712..99319ac1f22 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationSourceTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationSourceTab.java @@ -13,18 +13,16 @@ *******************************************************************************/ package org.eclipse.cdt.ui.newui; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.swt.widgets.Composite; - import org.eclipse.cdt.core.settings.model.CSourceEntry; import org.eclipse.cdt.core.settings.model.ICExclusionPatternPathEntry; import org.eclipse.cdt.core.settings.model.ICResourceDescription; import org.eclipse.cdt.core.settings.model.ICSettingEntry; import org.eclipse.cdt.core.settings.model.ICSourceEntry; - import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.swt.widgets.Composite; /** * @noextend This class is not intended to be subclassed by clients. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationTab.java index b4907dca011..7fd9b9e553c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationTab.java @@ -21,6 +21,13 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICExclusionPatternPathEntry; +import org.eclipse.cdt.core.settings.model.ICMultiItemsHolder; +import org.eclipse.cdt.core.settings.model.ICResourceDescription; +import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.cdt.ui.CDTSharedImages; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; @@ -52,15 +59,6 @@ import org.eclipse.ui.dialogs.NewFolderDialog; import org.eclipse.ui.model.WorkbenchContentProvider; import org.eclipse.ui.model.WorkbenchLabelProvider; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICExclusionPatternPathEntry; -import org.eclipse.cdt.core.settings.model.ICMultiItemsHolder; -import org.eclipse.cdt.core.settings.model.ICResourceDescription; -import org.eclipse.cdt.ui.CDTSharedImages; - -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * CLocationTab implements common features for "Source Location" and "Output Location" * tabs in project preferences. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ConfigMultiSelectionDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ConfigMultiSelectionDialog.java index e14eec99f2e..354226f82f3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ConfigMultiSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ConfigMultiSelectionDialog.java @@ -13,6 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.ui.newui; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.viewers.CheckStateChangedEvent; @@ -34,11 +37,6 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * @noextend This class is not intended to be subclassed by clients. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvDialog.java index 069fb915607..f7bca70dad0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvDialog.java @@ -13,6 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.ui.newui; +import org.eclipse.cdt.core.envvar.IEnvironmentVariable; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.internal.ui.newui.Messages; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.swt.SWT; @@ -29,11 +32,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.core.envvar.IEnvironmentVariable; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; - -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * @noextend This class is not intended to be subclassed by clients. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvironmentTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvironmentTab.java index cd9aad035a8..fb22ddaf045 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvironmentTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvironmentTab.java @@ -20,6 +20,16 @@ import java.util.Collections; import java.util.Iterator; import java.util.Map; +import org.eclipse.cdt.core.envvar.IEnvironmentVariable; +import org.eclipse.cdt.core.model.util.CDTListComparator; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICResourceDescription; +import org.eclipse.cdt.internal.core.envvar.EnvVarDescriptor; +import org.eclipse.cdt.internal.core.envvar.EnvironmentVariableManager; +import org.eclipse.cdt.internal.core.envvar.UserDefinedEnvironmentSupplier; +import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.cdt.utils.envvar.StorableEnvironment; +import org.eclipse.cdt.utils.spawner.EnvironmentReader; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.viewers.IColorProvider; import org.eclipse.jface.viewers.IFontProvider; @@ -51,19 +61,6 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.ui.dialogs.ListSelectionDialog; -import org.eclipse.cdt.core.envvar.IEnvironmentVariable; -import org.eclipse.cdt.core.model.util.CDTListComparator; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICResourceDescription; -import org.eclipse.cdt.utils.envvar.StorableEnvironment; -import org.eclipse.cdt.utils.spawner.EnvironmentReader; - -import org.eclipse.cdt.internal.core.envvar.EnvVarDescriptor; -import org.eclipse.cdt.internal.core.envvar.EnvironmentVariableManager; -import org.eclipse.cdt.internal.core.envvar.UserDefinedEnvironmentSupplier; - -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * @noextend This class is not intended to be subclassed by clients. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ErrorParsTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ErrorParsTab.java index 832e75d9fda..af0bf848796 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ErrorParsTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ErrorParsTab.java @@ -24,6 +24,23 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.ErrorParserManager; +import org.eclipse.cdt.core.IErrorParserNamed; +import org.eclipse.cdt.core.errorparsers.RegexErrorParser; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICMultiConfigDescription; +import org.eclipse.cdt.core.settings.model.ICResourceDescription; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.dialogs.ICOptionPage; +import org.eclipse.cdt.ui.dialogs.IInputStatusValidator; +import org.eclipse.cdt.ui.dialogs.InputStatusDialog; +import org.eclipse.cdt.ui.dialogs.RegexErrorParserOptionPage; +import org.eclipse.cdt.utils.ui.controls.TabFolderLayout; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; @@ -56,25 +73,6 @@ import org.osgi.service.prefs.BackingStoreException; import com.ibm.icu.text.MessageFormat; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.ErrorParserManager; -import org.eclipse.cdt.core.IErrorParserNamed; -import org.eclipse.cdt.core.errorparsers.RegexErrorParser; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICMultiConfigDescription; -import org.eclipse.cdt.core.settings.model.ICResourceDescription; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.dialogs.ICOptionPage; -import org.eclipse.cdt.ui.dialogs.IInputStatusValidator; -import org.eclipse.cdt.ui.dialogs.InputStatusDialog; -import org.eclipse.cdt.ui.dialogs.RegexErrorParserOptionPage; -import org.eclipse.cdt.utils.ui.controls.TabFolderLayout; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * This class represents Error Parser Tab in Project Properties or workspace Preferences * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExPatternDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExPatternDialog.java index e3d22465657..95c91ea2779 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExPatternDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExPatternDialog.java @@ -16,6 +16,17 @@ package org.eclipse.cdt.ui.newui; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator; +import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter; +import org.eclipse.cdt.internal.ui.dialogs.cpaths.CPathEntryMessages; +import org.eclipse.cdt.internal.ui.util.ImageDescriptorRegistry; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; @@ -44,19 +55,6 @@ import org.eclipse.ui.model.WorkbenchContentProvider; import org.eclipse.ui.model.WorkbenchLabelProvider; import org.eclipse.ui.views.navigator.ResourceComparator; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator; -import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter; -import org.eclipse.cdt.internal.ui.dialogs.cpaths.CPathEntryMessages; -import org.eclipse.cdt.internal.ui.util.ImageDescriptorRegistry; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; - /** * @noextend This class is not intended to be subclassed by clients. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExPatternEntryDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExPatternEntryDialog.java index bc37a6b52d4..e5865a00710 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExPatternEntryDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExPatternEntryDialog.java @@ -15,6 +15,15 @@ package org.eclipse.cdt.ui.newui; import java.util.List; +import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator; +import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter; +import org.eclipse.cdt.internal.ui.dialogs.cpaths.CPathEntryMessages; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.IStringButtonAdapter; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; +import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringButtonDialogField; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; @@ -42,16 +51,6 @@ import org.eclipse.ui.model.WorkbenchContentProvider; import org.eclipse.ui.model.WorkbenchLabelProvider; import org.eclipse.ui.views.navigator.ResourceComparator; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator; -import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter; -import org.eclipse.cdt.internal.ui.dialogs.cpaths.CPathEntryMessages; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.IStringButtonAdapter; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; -import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringButtonDialogField; - /** * @noextend This class is not intended to be subclassed by clients. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpDialog.java index b2e1ab8be08..b72c5a5c7e9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpDialog.java @@ -13,6 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.ui.newui; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICSettingEntry; +import org.eclipse.cdt.internal.ui.newui.Messages; //import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.swt.SWT; @@ -31,11 +34,6 @@ import org.eclipse.swt.widgets.List; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICSettingEntry; - -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * @noextend This class is not intended to be subclassed by clients. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ICPropertyProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ICPropertyProvider.java index bea0d2849a9..4fe521ddff7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ICPropertyProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ICPropertyProvider.java @@ -13,13 +13,12 @@ *******************************************************************************/ package org.eclipse.cdt.ui.newui; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.swt.widgets.Button; - import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.core.settings.model.ICResourceDescription; import org.eclipse.cdt.ui.dialogs.ICOptionContainer; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.swt.widgets.Button; /** * Interface provides a set of utility methods diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/INewCfgDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/INewCfgDialog.java index 35763726c4b..05bce2f24b7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/INewCfgDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/INewCfgDialog.java @@ -13,9 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.ui.newui; -import org.eclipse.swt.widgets.Shell; - import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.swt.widgets.Shell; /** * Represents class which is able to display diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ImportExportWizardButtons.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ImportExportWizardButtons.java index 6470a167b14..79ebf6d92f6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ImportExportWizardButtons.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ImportExportWizardButtons.java @@ -13,6 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.ui.newui; +import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.cdt.internal.ui.wizards.settingswizards.ProjectSettingsExportWizard; +import org.eclipse.cdt.internal.ui.wizards.settingswizards.ProjectSettingsImportWizard; +import org.eclipse.cdt.internal.ui.wizards.settingswizards.ProjectSettingsWizard; +import org.eclipse.cdt.ui.CDTSharedImages; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.wizard.WizardDialog; @@ -26,13 +31,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.ui.CDTSharedImages; - -import org.eclipse.cdt.internal.ui.newui.Messages; -import org.eclipse.cdt.internal.ui.wizards.settingswizards.ProjectSettingsExportWizard; -import org.eclipse.cdt.internal.ui.wizards.settingswizards.ProjectSettingsImportWizard; -import org.eclipse.cdt.internal.ui.wizards.settingswizards.ProjectSettingsWizard; - /** * Utility class that adds buttons for "Import Settings..." and "Export Settings..." * to the bottom of the Includes and Symbols tabs. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeDialog.java index 60c7c1b85a5..c0e43504677 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeDialog.java @@ -13,6 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.ui.newui; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICMultiConfigDescription; +import org.eclipse.cdt.core.settings.model.ICSettingEntry; +import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.cdt.ui.CDTSharedImages; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -29,13 +34,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICMultiConfigDescription; -import org.eclipse.cdt.core.settings.model.ICSettingEntry; -import org.eclipse.cdt.ui.CDTSharedImages; - -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * A combined dialog which allows selecting file or folder from workspace or filesystem * and some more features. The dialog is used on "Paths and Symbols" properties page. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeFileTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeFileTab.java index 074ba88f213..00a34ba2bd6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeFileTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeFileTab.java @@ -15,18 +15,16 @@ *******************************************************************************/ package org.eclipse.cdt.ui.newui; +import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; +import org.eclipse.cdt.core.settings.model.ICSettingEntry; +import org.eclipse.cdt.core.settings.model.util.CDataUtil; +import org.eclipse.cdt.internal.ui.newui.Messages; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleAdapter; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; -import org.eclipse.cdt.core.settings.model.ICSettingEntry; -import org.eclipse.cdt.core.settings.model.util.CDataUtil; - -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * This class provides UI for the {@link ICSettingEntry#INCLUDE_FILE} * option type. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeTab.java index f825befec5a..784ed2548ce 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeTab.java @@ -14,18 +14,16 @@ *******************************************************************************/ package org.eclipse.cdt.ui.newui; +import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; +import org.eclipse.cdt.core.settings.model.ICSettingEntry; +import org.eclipse.cdt.core.settings.model.util.CDataUtil; +import org.eclipse.cdt.internal.ui.newui.Messages; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleAdapter; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; -import org.eclipse.cdt.core.settings.model.ICSettingEntry; -import org.eclipse.cdt.core.settings.model.util.CDataUtil; - -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * @noextend This class is not intended to be subclassed by clients. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryPathTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryPathTab.java index d14f7f1e7df..fa6ba418c44 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryPathTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryPathTab.java @@ -14,17 +14,15 @@ *******************************************************************************/ package org.eclipse.cdt.ui.newui; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.TableColumn; - import org.eclipse.cdt.core.resources.IPathEntryStoreListener; import org.eclipse.cdt.core.resources.PathEntryStoreChangedEvent; import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; import org.eclipse.cdt.core.settings.model.ICSettingEntry; import org.eclipse.cdt.core.settings.model.util.CDataUtil; - import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.TableColumn; /** * @noextend This class is not intended to be subclassed by clients. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryTab.java index 7d8257e7418..dfdfb0da028 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryTab.java @@ -13,17 +13,15 @@ *******************************************************************************/ package org.eclipse.cdt.ui.newui; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.TableColumn; - import org.eclipse.cdt.core.resources.IPathEntryStoreListener; import org.eclipse.cdt.core.resources.PathEntryStoreChangedEvent; import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; import org.eclipse.cdt.core.settings.model.ICSettingEntry; import org.eclipse.cdt.core.settings.model.util.CDataUtil; - import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.TableColumn; /** * @noextend This class is not intended to be subclassed by clients. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigDialog.java index 4806554d78d..ca567cdaa12 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigDialog.java @@ -15,6 +15,11 @@ package org.eclipse.cdt.ui.newui; import java.util.Arrays; +import org.eclipse.cdt.core.model.util.CDTListComparator; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; @@ -37,13 +42,6 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; -import org.eclipse.cdt.core.model.util.CDTListComparator; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * @noextend This class is not intended to be subclassed by clients. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigRunner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigRunner.java index 7ce021b8c3e..115bc1dd1f5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigRunner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigRunner.java @@ -16,6 +16,10 @@ package org.eclipse.cdt.ui.newui; import java.lang.reflect.InvocationTargetException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; @@ -25,12 +29,6 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * @noextend This class is not intended to be subclassed by clients. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigSelector.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigSelector.java index 5cdfb803f82..bb74ad4ea89 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigSelector.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigSelector.java @@ -16,6 +16,11 @@ package org.eclipse.cdt.ui.newui; import java.util.ArrayList; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.internal.ui.cview.IncludeRefContainer; +import org.eclipse.cdt.internal.ui.cview.IncludeReferenceProxy; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; @@ -24,13 +29,6 @@ import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.Platform; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICProject; - -import org.eclipse.cdt.internal.ui.cview.IncludeRefContainer; -import org.eclipse.cdt.internal.ui.cview.IncludeReferenceProxy; - /** * This class provides static methods to work with multiple * implementors of "ConfigManager" extension point. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/MultiCfgContributedEnvironment.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/MultiCfgContributedEnvironment.java index a4f3d6a01cf..1d741d14196 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/MultiCfgContributedEnvironment.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/MultiCfgContributedEnvironment.java @@ -22,7 +22,6 @@ import org.eclipse.cdt.core.envvar.IEnvironmentVariable; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.core.settings.model.ICMultiConfigDescription; import org.eclipse.cdt.core.settings.model.MultiItemsHolder; - import org.eclipse.cdt.internal.core.envvar.ContributedEnvironment; /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/MultiLineTextFieldEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/MultiLineTextFieldEditor.java index f42311f7a7d..abc428e3c8a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/MultiLineTextFieldEditor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/MultiLineTextFieldEditor.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.ui.newui; +import org.eclipse.cdt.internal.ui.newui.Messages; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.preference.FieldEditor; import org.eclipse.swt.SWT; @@ -27,8 +28,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * MultiLineTextFieldEditor. * Field editor that is same as string field editor but diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/NewConfigurationDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/NewConfigurationDialog.java index d361b50d4ff..0556dd82204 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/NewConfigurationDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/NewConfigurationDialog.java @@ -13,6 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.ui.newui; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.core.settings.model.util.CDataUtil; +import org.eclipse.cdt.internal.ui.newui.Messages; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; @@ -35,12 +39,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.core.settings.model.util.CDataUtil; - -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * @noextend This class is not intended to be subclassed by clients. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_head_general.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_head_general.java index 3641dc7737f..2f15f34d755 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_head_general.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_head_general.java @@ -14,6 +14,9 @@ *******************************************************************************/ package org.eclipse.cdt.ui.newui; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.dialogs.DocCommentOwnerBlock; +import org.eclipse.cdt.ui.dialogs.ICOptionContainer; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IAdaptable; @@ -23,10 +26,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.dialogs.PropertyPage; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.dialogs.DocCommentOwnerBlock; -import org.eclipse.cdt.ui.dialogs.ICOptionContainer; - /** * @noextend This class is not intended to be subclassed by clients. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PrefPage_Abstract.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PrefPage_Abstract.java index b570433e2fc..36c47a42e85 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PrefPage_Abstract.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PrefPage_Abstract.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.ui.newui; +import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.cdt.core.model.CoreModel; - /* This class is a base for preference pages * which store data in preferences * It means: diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ProjectContentsArea.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ProjectContentsArea.java index f87167abc80..8c6d6468172 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ProjectContentsArea.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ProjectContentsArea.java @@ -19,6 +19,7 @@ import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; +import org.eclipse.cdt.internal.ui.newui.Messages; import org.eclipse.core.filesystem.URIUtil; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; @@ -39,8 +40,6 @@ import org.eclipse.swt.widgets.DirectoryDialog; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * @noextend This class is not intended to be subclassed by clients. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/RefsTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/RefsTab.java index e820237d076..3bff85563e7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/RefsTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/RefsTab.java @@ -25,6 +25,10 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICResourceDescription; +import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleAdapter; @@ -41,12 +45,6 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeItem; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICResourceDescription; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * @noextend This class is not intended to be subclassed by clients. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/RenameConfigurationDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/RenameConfigurationDialog.java index ee3dfe5eebe..c0bce373192 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/RenameConfigurationDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/RenameConfigurationDialog.java @@ -14,6 +14,8 @@ *******************************************************************************/ package org.eclipse.cdt.ui.newui; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.internal.ui.newui.Messages; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.preference.JFacePreferences; @@ -32,10 +34,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; - -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * @noextend This class is not intended to be subclassed by clients. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/StringListModeControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/StringListModeControl.java index beaa818d518..a320348da8e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/StringListModeControl.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/StringListModeControl.java @@ -17,6 +17,7 @@ package org.eclipse.cdt.ui.newui; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.internal.ui.newui.Messages; import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; @@ -26,8 +27,6 @@ import org.eclipse.swt.widgets.Link; import org.eclipse.swt.widgets.Listener; import org.eclipse.ui.dialogs.PreferencesUtil; -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * Local UI control for multiple configurations string list mode redirecting to * Preference page "Multiple Configurations Edit". diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/StructureTreeTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/StructureTreeTab.java index 763ea025113..fe06a0a17e5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/StructureTreeTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/StructureTreeTab.java @@ -17,6 +17,28 @@ import java.net.URI; import java.util.Iterator; import java.util.Map; +import org.eclipse.cdt.core.settings.model.ICBuildSetting; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICExclusionPatternPathEntry; +import org.eclipse.cdt.core.settings.model.ICExternalSetting; +import org.eclipse.cdt.core.settings.model.ICFileDescription; +import org.eclipse.cdt.core.settings.model.ICFolderDescription; +import org.eclipse.cdt.core.settings.model.ICLanguageSetting; +import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.core.settings.model.ICResourceDescription; +import org.eclipse.cdt.core.settings.model.ICSettingContainer; +import org.eclipse.cdt.core.settings.model.ICSettingObject; +import org.eclipse.cdt.core.settings.model.ICTargetPlatformSetting; +import org.eclipse.cdt.core.settings.model.extension.CBuildData; +import org.eclipse.cdt.core.settings.model.extension.CConfigurationData; +import org.eclipse.cdt.core.settings.model.extension.CFolderData; +import org.eclipse.cdt.core.settings.model.extension.CLanguageData; +import org.eclipse.cdt.core.settings.model.extension.CResourceData; +import org.eclipse.cdt.core.settings.model.extension.CTargetPlatformData; +import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectNatureDescriptor; @@ -46,30 +68,6 @@ import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeColumn; import org.eclipse.swt.widgets.TreeItem; -import org.eclipse.cdt.core.settings.model.ICBuildSetting; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICExclusionPatternPathEntry; -import org.eclipse.cdt.core.settings.model.ICExternalSetting; -import org.eclipse.cdt.core.settings.model.ICFileDescription; -import org.eclipse.cdt.core.settings.model.ICFolderDescription; -import org.eclipse.cdt.core.settings.model.ICLanguageSetting; -import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.core.settings.model.ICResourceDescription; -import org.eclipse.cdt.core.settings.model.ICSettingContainer; -import org.eclipse.cdt.core.settings.model.ICSettingObject; -import org.eclipse.cdt.core.settings.model.ICTargetPlatformSetting; -import org.eclipse.cdt.core.settings.model.extension.CBuildData; -import org.eclipse.cdt.core.settings.model.extension.CConfigurationData; -import org.eclipse.cdt.core.settings.model.extension.CFolderData; -import org.eclipse.cdt.core.settings.model.extension.CLanguageData; -import org.eclipse.cdt.core.settings.model.extension.CResourceData; -import org.eclipse.cdt.core.settings.model.extension.CTargetPlatformData; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * This tab is intended to browse * contents of whole class such as ResourceDescription, diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/SymbolDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/SymbolDialog.java index f88e9826e78..6eaf550a42a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/SymbolDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/SymbolDialog.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.ui.newui; +import org.eclipse.cdt.core.settings.model.ICResourceDescription; +import org.eclipse.cdt.internal.ui.newui.Messages; //import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.swt.SWT; @@ -28,10 +30,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.core.settings.model.ICResourceDescription; - -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * @noextend This class is not intended to be subclassed by clients. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/SymbolTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/SymbolTab.java index ee6940923f8..a4dee7dd8be 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/SymbolTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/SymbolTab.java @@ -17,6 +17,11 @@ package org.eclipse.cdt.ui.newui; import java.util.Collections; +import org.eclipse.cdt.core.model.util.CDTListComparator; +import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; +import org.eclipse.cdt.core.settings.model.ICSettingEntry; +import org.eclipse.cdt.core.settings.model.util.CDataUtil; +import org.eclipse.cdt.internal.ui.newui.Messages; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleAdapter; import org.eclipse.swt.accessibility.AccessibleEvent; @@ -25,13 +30,6 @@ import org.eclipse.swt.events.ControlEvent; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.cdt.core.model.util.CDTListComparator; -import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; -import org.eclipse.cdt.core.settings.model.ICSettingEntry; -import org.eclipse.cdt.core.settings.model.util.CDataUtil; - -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * @noextend This class is not intended to be subclassed by clients. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/CTextFileChange.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/CTextFileChange.java index f6564df7ef7..28fa935cf8b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/CTextFileChange.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/CTextFileChange.java @@ -15,6 +15,13 @@ *******************************************************************************/ package org.eclipse.cdt.ui.refactoring; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.cdt.internal.core.model.TranslationUnit; +import org.eclipse.cdt.internal.ui.refactoring.DocumentAdapter; +import org.eclipse.cdt.internal.ui.refactoring.changes.UndoCTextFileChange; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; @@ -24,16 +31,6 @@ import org.eclipse.ltk.core.refactoring.ContentStamp; import org.eclipse.ltk.core.refactoring.TextFileChange; import org.eclipse.text.edits.UndoEdit; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.model.IWorkingCopy; - -import org.eclipse.cdt.internal.core.model.TranslationUnit; - -import org.eclipse.cdt.internal.ui.refactoring.DocumentAdapter; -import org.eclipse.cdt.internal.ui.refactoring.changes.UndoCTextFileChange; - /** * A TextFileChange that uses a working copy in order to generate CModel events. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/CRefactoringActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/CRefactoringActionGroup.java index ab1f79f5ee8..66149813d43 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/CRefactoringActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/CRefactoringActionGroup.java @@ -17,6 +17,10 @@ package org.eclipse.cdt.ui.refactoring.actions; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ISourceReference; +import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds; +import org.eclipse.cdt.ui.actions.CdtActionConstants; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; @@ -33,12 +37,6 @@ import org.eclipse.ui.actions.ActionGroup; import org.eclipse.ui.part.Page; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ISourceReference; -import org.eclipse.cdt.ui.actions.CdtActionConstants; - -import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds; - /** * Action group that adds refactoring actions (for example Rename..., Move..., etc) * to a context menu and the global menu bar. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/CRenameAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/CRenameAction.java index 14587b88937..ac392d1c068 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/CRenameAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/CRenameAction.java @@ -15,20 +15,18 @@ package org.eclipse.cdt.ui.refactoring.actions; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.window.IShellProvider; - import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.IInclude; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; - import org.eclipse.cdt.internal.ui.actions.ActionUtil; import org.eclipse.cdt.internal.ui.refactoring.rename.CRefactory; import org.eclipse.cdt.internal.ui.refactoring.rename.RenameLinkedMode; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.jface.window.IShellProvider; /** * Launches a rename refactoring. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/ExtractConstantAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/ExtractConstantAction.java index 726adeaaef7..6eca583a7e1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/ExtractConstantAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/ExtractConstantAction.java @@ -14,13 +14,11 @@ *******************************************************************************/ package org.eclipse.cdt.ui.refactoring.actions; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.window.IShellProvider; - import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.IWorkingCopy; - import org.eclipse.cdt.internal.ui.refactoring.extractconstant.ExtractConstantRefactoringRunner; +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.jface.window.IShellProvider; /** * Launches an Extract Constant refactoring. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/ExtractFunctionAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/ExtractFunctionAction.java index 5ae37a7ffc3..607d0e4b209 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/ExtractFunctionAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/ExtractFunctionAction.java @@ -15,13 +15,11 @@ ******************************************************************************/ package org.eclipse.cdt.ui.refactoring.actions; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.window.IShellProvider; - import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.IWorkingCopy; - import org.eclipse.cdt.internal.ui.refactoring.extractfunction.ExtractFunctionRefactoringRunner; +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.jface.window.IShellProvider; /** * Launches an Extract Function refactoring. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/ExtractLocalVariableAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/ExtractLocalVariableAction.java index 9f81ffbb10b..ab990d1fa50 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/ExtractLocalVariableAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/ExtractLocalVariableAction.java @@ -14,13 +14,11 @@ *******************************************************************************/ package org.eclipse.cdt.ui.refactoring.actions; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.window.IShellProvider; - import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.IWorkingCopy; - import org.eclipse.cdt.internal.ui.refactoring.extractlocalvariable.ExtractLocalVariableRefactoringRunner; +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.jface.window.IShellProvider; /** * Launches an Extract Local Variable refactoring. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/GettersAndSettersAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/GettersAndSettersAction.java index 005d92a1325..52ea3d9d169 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/GettersAndSettersAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/GettersAndSettersAction.java @@ -15,17 +15,15 @@ *******************************************************************************/ package org.eclipse.cdt.ui.refactoring.actions; -import org.eclipse.core.resources.IFile; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.window.IShellProvider; -import org.eclipse.ui.IEditorPart; - import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.IField; import org.eclipse.cdt.core.model.ISourceReference; import org.eclipse.cdt.core.model.IWorkingCopy; - import org.eclipse.cdt.internal.ui.refactoring.gettersandsetters.GenerateGettersAndSettersRefactoringRunner; +import org.eclipse.core.resources.IFile; +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.jface.window.IShellProvider; +import org.eclipse.ui.IEditorPart; /** * Launches a getter and setter source code generation. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/HideMethodAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/HideMethodAction.java index 93818f35fae..ca8209a9765 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/HideMethodAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/HideMethodAction.java @@ -15,15 +15,13 @@ *******************************************************************************/ package org.eclipse.cdt.ui.refactoring.actions; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.window.IShellProvider; - import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.IMethodDeclaration; import org.eclipse.cdt.core.model.ISourceReference; import org.eclipse.cdt.core.model.IWorkingCopy; - import org.eclipse.cdt.internal.ui.refactoring.hidemethod.HideMethodRefactoringRunner; +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.jface.window.IShellProvider; /** * Launches a Hide Method refactoring diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/ImplementMethodAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/ImplementMethodAction.java index ecb099825ab..1f463093622 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/ImplementMethodAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/ImplementMethodAction.java @@ -15,19 +15,17 @@ package org.eclipse.cdt.ui.refactoring.actions; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.window.IShellProvider; -import org.eclipse.ui.IEditorPart; - import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.IMethod; import org.eclipse.cdt.core.model.IMethodDeclaration; import org.eclipse.cdt.core.model.ISourceReference; import org.eclipse.cdt.core.model.IWorkingCopy; - import org.eclipse.cdt.internal.ui.refactoring.implementmethod.ImplementMethodRefactoringRunner; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IResource; +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.jface.window.IShellProvider; +import org.eclipse.ui.IEditorPart; /** * Launches the implement method source generator (refactoring). diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/RefactoringAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/RefactoringAction.java index a08dd04d548..e742e88678b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/RefactoringAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/RefactoringAction.java @@ -13,6 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.ui.refactoring.actions; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.cdt.internal.ui.editor.CEditor; +import org.eclipse.cdt.internal.ui.refactoring.utils.EclipseObjects; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.action.Action; import org.eclipse.jface.text.ITextSelection; import org.eclipse.jface.viewers.ISelection; @@ -21,13 +26,6 @@ import org.eclipse.jface.window.IShellProvider; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchSite; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.editor.CEditor; -import org.eclipse.cdt.internal.ui.refactoring.utils.EclipseObjects; - /** * Common base class for refactoring actions. * @since 5.0 diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/ToggleFunctionAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/ToggleFunctionAction.java index 35847faa278..864743158b6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/ToggleFunctionAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/ToggleFunctionAction.java @@ -15,17 +15,15 @@ ******************************************************************************/ package org.eclipse.cdt.ui.refactoring.actions; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.cdt.internal.ui.refactoring.togglefunction.ToggleRefactoringRunner; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.text.ITextSelection; import org.eclipse.jface.window.IShellProvider; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.IWorkingCopy; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.refactoring.togglefunction.ToggleRefactoringRunner; - /** * @since 5.3 * @author Emanuel Graf IFS diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/resources/RefreshExclusionContributionManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/resources/RefreshExclusionContributionManager.java index 630c50c6224..90cc789b062 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/resources/RefreshExclusionContributionManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/resources/RefreshExclusionContributionManager.java @@ -17,14 +17,13 @@ import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.Platform; -import org.eclipse.cdt.ui.CUIPlugin; - /** * <strong>EXPERIMENTAL</strong>. This class or interface has been added as part of a work in progress. There * is no guarantee that this API will work or that it will remain the same. Please do not use this API without diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/resources/RefreshExclusionContributor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/resources/RefreshExclusionContributor.java index 00dc8143237..37020dacc70 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/resources/RefreshExclusionContributor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/resources/RefreshExclusionContributor.java @@ -13,9 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.ui.resources; -import org.eclipse.swt.widgets.Composite; - import org.eclipse.cdt.core.resources.RefreshExclusion; +import org.eclipse.swt.widgets.Composite; /** * <strong>EXPERIMENTAL</strong>. This class or interface has been added as part of a work in progress. There diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/AbstractCScanner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/AbstractCScanner.java index d06d341cc5c..c72e22b2e63 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/AbstractCScanner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/AbstractCScanner.java @@ -19,14 +19,13 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.eclipse.cdt.ui.IPropertyChangeParticipant; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.rules.BufferedRuleBasedScanner; import org.eclipse.jface.text.rules.IRule; import org.eclipse.jface.text.rules.IToken; import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.cdt.ui.IPropertyChangeParticipant; - /** * Convenience implementation for {@link ICTokenScanner}. * Subclasses need to initialize scanner rules by calling {@link #setRules(IRule[])} or {@link #setRules(List)}. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/AsmSourceViewerConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/AsmSourceViewerConfiguration.java index 932829a8b32..557f8db67c3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/AsmSourceViewerConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/AsmSourceViewerConfiguration.java @@ -16,6 +16,22 @@ package org.eclipse.cdt.ui.text; import java.util.Map; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.model.AssemblyLanguage; +import org.eclipse.cdt.core.model.IAsmLanguage; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.model.LanguageManager; +import org.eclipse.cdt.internal.ui.editor.asm.AsmCodeScanner; +import org.eclipse.cdt.internal.ui.editor.asm.AsmPreprocessorScanner; +import org.eclipse.cdt.internal.ui.editor.asm.AsmReconcilingStrategy; +import org.eclipse.cdt.internal.ui.text.CCommentScanner; +import org.eclipse.cdt.internal.ui.text.PartitionDamager; +import org.eclipse.cdt.internal.ui.text.SingleTokenCScanner; +import org.eclipse.cdt.internal.ui.text.TokenStore; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.ILanguageUI; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IAdaptable; @@ -39,24 +55,6 @@ import org.eclipse.ui.editors.text.TextSourceViewerConfiguration; import org.eclipse.ui.ide.ResourceUtil; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.model.AssemblyLanguage; -import org.eclipse.cdt.core.model.IAsmLanguage; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.model.LanguageManager; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.ILanguageUI; - -import org.eclipse.cdt.internal.ui.editor.asm.AsmCodeScanner; -import org.eclipse.cdt.internal.ui.editor.asm.AsmPreprocessorScanner; -import org.eclipse.cdt.internal.ui.editor.asm.AsmReconcilingStrategy; -import org.eclipse.cdt.internal.ui.text.CCommentScanner; -import org.eclipse.cdt.internal.ui.text.PartitionDamager; -import org.eclipse.cdt.internal.ui.text.SingleTokenCScanner; -import org.eclipse.cdt.internal.ui.text.TokenStore; - /** * Configuration for a source viewer which shows Assembly code. * <p> diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/CSourceViewerConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/CSourceViewerConfiguration.java index b6aa2060f42..03ff0a005f5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/CSourceViewerConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/CSourceViewerConfiguration.java @@ -20,6 +20,51 @@ package org.eclipse.cdt.ui.text; import java.util.Arrays; import java.util.Map; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.ast.gnu.cpp.GPPLanguage; +import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICLanguageKeywords; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.core.model.LanguageManager; +import org.eclipse.cdt.internal.core.model.ProgressMonitorAndCanceler; +import org.eclipse.cdt.internal.corext.util.CodeFormatterUtil; +import org.eclipse.cdt.internal.ui.editor.CDocumentProvider; +import org.eclipse.cdt.internal.ui.text.CAutoIndentStrategy; +import org.eclipse.cdt.internal.ui.text.CCodeScanner; +import org.eclipse.cdt.internal.ui.text.CCommentScanner; +import org.eclipse.cdt.internal.ui.text.CCompositeReconcilingStrategy; +import org.eclipse.cdt.internal.ui.text.CDoubleClickSelector; +import org.eclipse.cdt.internal.ui.text.CFormattingStrategy; +import org.eclipse.cdt.internal.ui.text.COutlineInformationControl; +import org.eclipse.cdt.internal.ui.text.CPreprocessorScanner; +import org.eclipse.cdt.internal.ui.text.CPresentationReconciler; +import org.eclipse.cdt.internal.ui.text.CReconciler; +import org.eclipse.cdt.internal.ui.text.CStringAutoIndentStrategy; +import org.eclipse.cdt.internal.ui.text.CStringDoubleClickSelector; +import org.eclipse.cdt.internal.ui.text.HTMLAnnotationHover; +import org.eclipse.cdt.internal.ui.text.PartitionDamager; +import org.eclipse.cdt.internal.ui.text.SingleTokenCScanner; +import org.eclipse.cdt.internal.ui.text.TokenStore; +import org.eclipse.cdt.internal.ui.text.c.hover.CEditorTextHoverDescriptor; +import org.eclipse.cdt.internal.ui.text.c.hover.CEditorTextHoverProxy; +import org.eclipse.cdt.internal.ui.text.c.hover.CInformationProvider; +import org.eclipse.cdt.internal.ui.text.c.hover.CMacroExpansionExplorationControl; +import org.eclipse.cdt.internal.ui.text.c.hover.CMacroExpansionInformationProvider; +import org.eclipse.cdt.internal.ui.text.contentassist.CContentAssistProcessor; +import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference; +import org.eclipse.cdt.internal.ui.text.correction.CCorrectionAssistant; +import org.eclipse.cdt.internal.ui.text.doctools.DocCommentOwnerManager; +import org.eclipse.cdt.internal.ui.typehierarchy.THInformationControl; +import org.eclipse.cdt.internal.ui.typehierarchy.THInformationProvider; +import org.eclipse.cdt.ui.CElementContentProvider; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.ILanguageUI; +import org.eclipse.cdt.ui.text.doctools.DefaultMultilineCommentAutoEditStrategy; +import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; +import org.eclipse.cdt.ui.text.doctools.IDocCommentViewerConfiguration; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -69,54 +114,6 @@ import org.eclipse.ui.ide.ResourceUtil; import org.eclipse.ui.texteditor.IDocumentProvider; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.ast.gnu.cpp.GPPLanguage; -import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICLanguageKeywords; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.model.LanguageManager; -import org.eclipse.cdt.ui.CElementContentProvider; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.ILanguageUI; -import org.eclipse.cdt.ui.text.doctools.DefaultMultilineCommentAutoEditStrategy; -import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; -import org.eclipse.cdt.ui.text.doctools.IDocCommentViewerConfiguration; - -import org.eclipse.cdt.internal.core.model.ProgressMonitorAndCanceler; -import org.eclipse.cdt.internal.corext.util.CodeFormatterUtil; - -import org.eclipse.cdt.internal.ui.editor.CDocumentProvider; -import org.eclipse.cdt.internal.ui.text.CAutoIndentStrategy; -import org.eclipse.cdt.internal.ui.text.CCodeScanner; -import org.eclipse.cdt.internal.ui.text.CCommentScanner; -import org.eclipse.cdt.internal.ui.text.CCompositeReconcilingStrategy; -import org.eclipse.cdt.internal.ui.text.CDoubleClickSelector; -import org.eclipse.cdt.internal.ui.text.CFormattingStrategy; -import org.eclipse.cdt.internal.ui.text.COutlineInformationControl; -import org.eclipse.cdt.internal.ui.text.CPreprocessorScanner; -import org.eclipse.cdt.internal.ui.text.CPresentationReconciler; -import org.eclipse.cdt.internal.ui.text.CReconciler; -import org.eclipse.cdt.internal.ui.text.CStringAutoIndentStrategy; -import org.eclipse.cdt.internal.ui.text.CStringDoubleClickSelector; -import org.eclipse.cdt.internal.ui.text.HTMLAnnotationHover; -import org.eclipse.cdt.internal.ui.text.PartitionDamager; -import org.eclipse.cdt.internal.ui.text.SingleTokenCScanner; -import org.eclipse.cdt.internal.ui.text.TokenStore; -import org.eclipse.cdt.internal.ui.text.c.hover.CEditorTextHoverDescriptor; -import org.eclipse.cdt.internal.ui.text.c.hover.CEditorTextHoverProxy; -import org.eclipse.cdt.internal.ui.text.c.hover.CInformationProvider; -import org.eclipse.cdt.internal.ui.text.c.hover.CMacroExpansionExplorationControl; -import org.eclipse.cdt.internal.ui.text.c.hover.CMacroExpansionInformationProvider; -import org.eclipse.cdt.internal.ui.text.contentassist.CContentAssistProcessor; -import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference; -import org.eclipse.cdt.internal.ui.text.correction.CCorrectionAssistant; -import org.eclipse.cdt.internal.ui.text.doctools.DocCommentOwnerManager; -import org.eclipse.cdt.internal.ui.typehierarchy.THInformationControl; -import org.eclipse.cdt.internal.ui.typehierarchy.THInformationProvider; - /** * Configuration for a <code>SourceViewer</code> which shows C/C++ code. * <p> diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/ICTokenScanner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/ICTokenScanner.java index 99eed339c8d..512b0459d8d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/ICTokenScanner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/ICTokenScanner.java @@ -13,8 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.ui.text; -import org.eclipse.jface.text.rules.ITokenScanner; import org.eclipse.cdt.ui.IPropertyChangeParticipant; +import org.eclipse.jface.text.rules.ITokenScanner; /** * Interface for CDT Scanners. Scanners used in CDT must additionally be diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/IQuickFixProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/IQuickFixProcessor.java index 8bec59c8ae5..400b26bf711 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/IQuickFixProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/IQuickFixProcessor.java @@ -14,9 +14,8 @@ *******************************************************************************/ package org.eclipse.cdt.ui.text; -import org.eclipse.core.runtime.CoreException; - import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.core.runtime.CoreException; /** * Interface to be implemented by contributors to the extension point diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/ITokenStore.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/ITokenStore.java index 817208bfbf8..6cde09a7df1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/ITokenStore.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/ITokenStore.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.ui.text; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.text.rules.IToken; - import org.eclipse.cdt.ui.IPropertyChangeParticipant; import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.jface.text.rules.IToken; /** * An ITokenStore manages a set of tokens for a specified set of color property identifiers. Responsibilities include diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/SharedASTJob.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/SharedASTJob.java index 81c83f98bc2..8c1278dabe0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/SharedASTJob.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/SharedASTJob.java @@ -13,6 +13,12 @@ *******************************************************************************/ package org.eclipse.cdt.ui.text; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; +import org.eclipse.cdt.internal.ui.editor.ASTProvider; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -20,15 +26,6 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable; - -import org.eclipse.cdt.internal.ui.editor.ASTProvider; - /** * A Job specialized to give access to the shared AST of the currently active editor. * Clients must implement {@link #runOnAST(ILanguage, IASTTranslationUnit)}. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/TaskTagRule.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/TaskTagRule.java index 6cb34f54204..81eddaf432c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/TaskTagRule.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/TaskTagRule.java @@ -16,6 +16,8 @@ *******************************************************************************/ package org.eclipse.cdt.ui.text; +import org.eclipse.cdt.core.CCorePreferenceConstants; +import org.eclipse.cdt.ui.IPropertyChangeParticipant; import org.eclipse.core.runtime.Preferences; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.rules.IToken; @@ -24,9 +26,6 @@ import org.eclipse.jface.text.rules.Token; import org.eclipse.jface.text.rules.WordRule; import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.cdt.core.CCorePreferenceConstants; -import org.eclipse.cdt.ui.IPropertyChangeParticipant; - /** * Which words should be recognized as task tags is specified under {@link CCorePreferenceConstants#TODO_TASK_TAGS} as a * comma delimited list. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/contentassist/ICEditorContentAssistInvocationContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/contentassist/ICEditorContentAssistInvocationContext.java index 15e647b7954..eb466b33d35 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/contentassist/ICEditorContentAssistInvocationContext.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/contentassist/ICEditorContentAssistInvocationContext.java @@ -13,15 +13,14 @@ *******************************************************************************/ package org.eclipse.cdt.ui.text.contentassist; +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.ITextViewer; import org.eclipse.ui.IEditorPart; -import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ITranslationUnit; - /** * Describes the context of a content assist invocation in a C/C++ editor. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/contentassist/ICompletionContributor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/contentassist/ICompletionContributor.java index d62c0cdbac7..ca178431480 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/contentassist/ICompletionContributor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/contentassist/ICompletionContributor.java @@ -15,10 +15,9 @@ package org.eclipse.cdt.ui.text.contentassist; import java.util.List; -import org.eclipse.jface.text.ITextViewer; - import org.eclipse.cdt.core.dom.ast.ASTCompletionNode; import org.eclipse.cdt.core.model.IWorkingCopy; +import org.eclipse.jface.text.ITextViewer; /** * This interface must be implemented by clients extending the extension point diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/DefaultMultilineCommentAutoEditStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/DefaultMultilineCommentAutoEditStrategy.java index 1f57fe499b3..a925cd994b0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/DefaultMultilineCommentAutoEditStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/DefaultMultilineCommentAutoEditStrategy.java @@ -18,6 +18,19 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.StringReader; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.ast.ASTVisitor; +import org.eclipse.cdt.core.dom.ast.IASTDeclaration; +import org.eclipse.cdt.core.dom.ast.IASTNode; +import org.eclipse.cdt.core.dom.ast.IASTNodeLocation; +import org.eclipse.cdt.core.dom.ast.IASTNodeSelector; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ITranslationUnit; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.IWorkingCopyManager; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.DocumentCommand; @@ -35,20 +48,6 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.ast.ASTVisitor; -import org.eclipse.cdt.core.dom.ast.IASTDeclaration; -import org.eclipse.cdt.core.dom.ast.IASTNode; -import org.eclipse.cdt.core.dom.ast.IASTNodeLocation; -import org.eclipse.cdt.core.dom.ast.IASTNodeSelector; -import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.index.IIndex; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.IWorkingCopyManager; -import org.eclipse.cdt.ui.text.ICPartitions; - /** * This class provides default behaviors for multi-line comment auto-editing. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/IDocCommentViewerConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/IDocCommentViewerConfiguration.java index e15458b43a8..4573777d129 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/IDocCommentViewerConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/IDocCommentViewerConfiguration.java @@ -13,14 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.ui.text.doctools; -import org.eclipse.jface.text.IAutoEditStrategy; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.ITextDoubleClickStrategy; - import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.cdt.ui.text.ICTokenScanner; import org.eclipse.cdt.ui.text.ITokenStoreFactory; import org.eclipse.cdt.ui.text.contentassist.ICompletionProposalComputer; +import org.eclipse.jface.text.IAutoEditStrategy; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.ITextDoubleClickStrategy; /** * An IDocCommentViewerConfiguration aggregates a collection of editor tools that can be contributed to diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenHelper.java index 07c478cadd3..8737f6ba99c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenHelper.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenHelper.java @@ -20,13 +20,13 @@ import java.io.InputStreamReader; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.doctools.generic.GenericDocTag; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.doctools.generic.GenericDocTag; /** * Makes available information for Doxygen support. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenMultilineAutoEditStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenMultilineAutoEditStrategy.java index 888817d0238..a8a7da71f0e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenMultilineAutoEditStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenMultilineAutoEditStrategy.java @@ -16,13 +16,6 @@ package org.eclipse.cdt.ui.text.doctools.doxygen; import java.util.LinkedHashSet; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IAutoEditStrategy; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.ITypedRegion; -import org.eclipse.jface.text.TextUtilities; - import org.eclipse.cdt.core.dom.ast.ExpansionOverlapsBoundaryException; import org.eclipse.cdt.core.dom.ast.IASTArrayDeclarator; import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; @@ -43,6 +36,12 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLinkageSpecification; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateDeclaration; import org.eclipse.cdt.core.parser.IToken; import org.eclipse.cdt.ui.text.doctools.DefaultMultilineCommentAutoEditStrategy; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IAutoEditStrategy; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.ITypedRegion; +import org.eclipse.jface.text.TextUtilities; /** * {@link IAutoEditStrategy} for adding Doxygen tags for comments. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenMultilineConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenMultilineConfiguration.java index 9047ac6689b..77e107b52d3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenMultilineConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenMultilineConfiguration.java @@ -13,15 +13,14 @@ *******************************************************************************/ package org.eclipse.cdt.ui.text.doctools.doxygen; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IAutoEditStrategy; -import org.eclipse.jface.text.IDocument; - import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.cdt.ui.text.doctools.IDocCommentViewerConfiguration; import org.eclipse.cdt.ui.text.doctools.generic.AbstractGenericTagDocCommentViewerConfiguration; import org.eclipse.cdt.ui.text.doctools.generic.GenericDocTag; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IAutoEditStrategy; +import org.eclipse.jface.text.IDocument; /** * {@link IDocCommentViewerConfiguration} implementation for doxygen multi-line documentation comments. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenSingleAutoEditStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenSingleAutoEditStrategy.java index 4f354e34ef6..7bc93be9459 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenSingleAutoEditStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenSingleAutoEditStrategy.java @@ -14,6 +14,11 @@ *******************************************************************************/ package org.eclipse.cdt.ui.text.doctools.doxygen; +import org.eclipse.cdt.core.dom.ast.IASTDeclaration; +import org.eclipse.cdt.core.dom.ast.IASTNode; +import org.eclipse.cdt.core.dom.ast.IASTNodeSelector; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.DocumentCommand; import org.eclipse.jface.text.DocumentRewriteSession; @@ -26,12 +31,6 @@ import org.eclipse.jface.text.ITypedRegion; import org.eclipse.jface.text.Region; import org.eclipse.jface.text.TextUtilities; -import org.eclipse.cdt.core.dom.ast.IASTDeclaration; -import org.eclipse.cdt.core.dom.ast.IASTNode; -import org.eclipse.cdt.core.dom.ast.IASTNodeSelector; -import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.ui.text.ICPartitions; - /** * {@link IAutoEditStrategy} for adding Doxygen tags for comments. * diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenSingleConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenSingleConfiguration.java index 58242f7c84c..d1c647067ee 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenSingleConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenSingleConfiguration.java @@ -13,15 +13,14 @@ *******************************************************************************/ package org.eclipse.cdt.ui.text.doctools.doxygen; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IAutoEditStrategy; -import org.eclipse.jface.text.IDocument; - import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.cdt.ui.text.doctools.IDocCommentViewerConfiguration; import org.eclipse.cdt.ui.text.doctools.generic.AbstractGenericTagDocCommentViewerConfiguration; import org.eclipse.cdt.ui.text.doctools.generic.GenericDocTag; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IAutoEditStrategy; +import org.eclipse.jface.text.IDocument; /** * {@link IDocCommentViewerConfiguration} implementation for doxygen single-line documentation comments. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/AbstractGenericTagDocCommentViewerConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/AbstractGenericTagDocCommentViewerConfiguration.java index a285363d614..e987d2a7fc9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/AbstractGenericTagDocCommentViewerConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/AbstractGenericTagDocCommentViewerConfiguration.java @@ -13,14 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.ui.text.doctools.generic; -import org.eclipse.jface.text.ITextDoubleClickStrategy; - import org.eclipse.cdt.ui.text.ICTokenScanner; import org.eclipse.cdt.ui.text.ITokenStoreFactory; import org.eclipse.cdt.ui.text.contentassist.ICompletionProposalComputer; import org.eclipse.cdt.ui.text.doctools.IDocCommentDictionary; import org.eclipse.cdt.ui.text.doctools.IDocCommentSimpleDictionary; import org.eclipse.cdt.ui.text.doctools.IDocCommentViewerConfiguration; +import org.eclipse.jface.text.ITextDoubleClickStrategy; /** * An abstract base-class for documentation tool contributions using the 'generic tag' framework diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/GenericTagCommentScanner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/GenericTagCommentScanner.java index f8c2da17158..35e14a98362 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/GenericTagCommentScanner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/GenericTagCommentScanner.java @@ -16,6 +16,11 @@ package org.eclipse.cdt.ui.text.doctools.generic; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.internal.ui.text.TaskTagRule; +import org.eclipse.cdt.ui.PreferenceConstants; +import org.eclipse.cdt.ui.text.ICTokenScanner; +import org.eclipse.cdt.ui.text.ITokenStore; +import org.eclipse.cdt.ui.text.ITokenStoreFactory; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.rules.BufferedRuleBasedScanner; @@ -25,13 +30,6 @@ import org.eclipse.jface.text.rules.IWordDetector; import org.eclipse.jface.text.rules.WordRule; import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.cdt.ui.PreferenceConstants; -import org.eclipse.cdt.ui.text.ICTokenScanner; -import org.eclipse.cdt.ui.text.ITokenStore; -import org.eclipse.cdt.ui.text.ITokenStoreFactory; - -import org.eclipse.cdt.internal.ui.text.TaskTagRule; - /** * ICTokenScanner which recognizes a specified set of tags, starting with a specified name. * It is assumed this will be used within a single-line or multi-line comment context. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/GenericTagCompletionProposalComputer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/GenericTagCompletionProposalComputer.java index fb645f0ffb2..ade04e42cc3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/GenericTagCompletionProposalComputer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/GenericTagCompletionProposalComputer.java @@ -17,6 +17,10 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.eclipse.cdt.internal.ui.text.contentassist.CCompletionProposal; +import org.eclipse.cdt.ui.text.ICPartitions; +import org.eclipse.cdt.ui.text.contentassist.ContentAssistInvocationContext; +import org.eclipse.cdt.ui.text.contentassist.ICompletionProposalComputer; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; @@ -25,12 +29,6 @@ import org.eclipse.jface.text.TextUtilities; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContextInformation; -import org.eclipse.cdt.ui.text.ICPartitions; -import org.eclipse.cdt.ui.text.contentassist.ContentAssistInvocationContext; -import org.eclipse.cdt.ui.text.contentassist.ICompletionProposalComputer; - -import org.eclipse.cdt.internal.ui.text.contentassist.CCompletionProposal; - /** * CompletionProposalComputer based on a specified set of GenericTag objects. * @since 5.0 diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/GenericTagDoubleClickStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/GenericTagDoubleClickStrategy.java index d080282834b..3422da62d2b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/GenericTagDoubleClickStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/GenericTagDoubleClickStrategy.java @@ -13,7 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.ui.text.doctools.generic; -import com.ibm.icu.text.BreakIterator; import java.text.CharacterIterator; import org.eclipse.jface.text.BadLocationException; @@ -23,6 +22,8 @@ import org.eclipse.jface.text.ITextDoubleClickStrategy; import org.eclipse.jface.text.ITextViewer; import org.eclipse.jface.text.Region; +import com.ibm.icu.text.BreakIterator; + /** * A double-click strategy for words starting with specified tag markers. * @since 5.0 diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CCProjectWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CCProjectWizard.java index f61afb1ce44..1a17148b05a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CCProjectWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CCProjectWizard.java @@ -14,16 +14,14 @@ *******************************************************************************/ package org.eclipse.cdt.ui.wizards; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.SubProgressMonitor; - import org.eclipse.cdt.core.CCProjectNature; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CProjectNature; - import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.SubProgressMonitor; /** * The wizard to create new MBS C++ Project. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java index 0c20007b168..d56120c4087 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java @@ -20,6 +20,15 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ILanguage; +import org.eclipse.cdt.core.model.LanguageManager; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager; +import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.cdt.internal.ui.wizards.ICDTCommonProjectWizard; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.filesystem.EFS; import org.eclipse.core.filesystem.IFileInfo; import org.eclipse.core.filesystem.IFileStore; @@ -45,17 +54,6 @@ import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation; import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard; import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ILanguage; -import org.eclipse.cdt.core.model.LanguageManager; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.newui.Messages; -import org.eclipse.cdt.internal.ui.wizards.ICDTCommonProjectWizard; - public abstract class CDTCommonProjectWizard extends BasicNewResourceWizard implements IExecutableExtension, IWizardWithMemory, ICDTCommonProjectWizard { private static final String PREFIX = "CProjectWizard"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java index e41763dcd1b..ea368304025 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java @@ -19,6 +19,11 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.newui.CDTPrefUtil; +import org.eclipse.cdt.ui.newui.PageLayout; import org.eclipse.core.filesystem.EFS; import org.eclipse.core.filesystem.IFileInfo; import org.eclipse.core.filesystem.IFileStore; @@ -50,13 +55,6 @@ import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeItem; import org.eclipse.ui.dialogs.WizardNewProjectCreationPage; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.newui.CDTPrefUtil; -import org.eclipse.cdt.ui.newui.PageLayout; - -import org.eclipse.cdt.internal.ui.newui.Messages; - public class CDTMainWizardPage extends WizardNewProjectCreationPage implements IWizardItemsListListener { public static final String PAGE_ID = "org.eclipse.cdt.managedbuilder.ui.wizard.NewModelProjectWizardPage"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTProjectWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTProjectWizard.java index ad3382abdbd..aead107b5fa 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTProjectWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTProjectWizard.java @@ -13,9 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.ui.wizards; -import org.eclipse.core.resources.IProject; - import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.core.resources.IProject; public class CDTProjectWizard extends CDTCommonProjectWizard { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CProjectWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CProjectWizard.java index 056eabf56d4..bc75c8a38e7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CProjectWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CProjectWizard.java @@ -14,16 +14,14 @@ *******************************************************************************/ package org.eclipse.cdt.ui.wizards; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.CProjectNature; +import org.eclipse.cdt.internal.ui.newui.Messages; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.SubProgressMonitor; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.CProjectNature; - -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * The wizard to create new MBS C Project. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CWizardHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CWizardHandler.java index 179326b9684..f96e57e338c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CWizardHandler.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CWizardHandler.java @@ -16,6 +16,8 @@ package org.eclipse.cdt.ui.wizards; import java.util.List; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.newui.CDTPrefUtil; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; @@ -26,9 +28,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableItem; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.newui.CDTPrefUtil; - /** * This class is basic implementation for ICWizardHandler interface. * It is independent of managed build system, and, so, almost useless diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/EntryDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/EntryDescriptor.java index ef8d72a52ee..ab92117ea0a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/EntryDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/EntryDescriptor.java @@ -13,9 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.ui.wizards; -import org.eclipse.swt.graphics.Image; - import org.eclipse.cdt.core.settings.model.util.CDataUtil; +import org.eclipse.swt.graphics.Image; /** * This class stores data for each tree item diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/ICPathContainerPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/ICPathContainerPage.java index 3ad9a3b81e1..ab577faa595 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/ICPathContainerPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/ICPathContainerPage.java @@ -13,10 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.ui.wizards; -import org.eclipse.jface.wizard.IWizardPage; - import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.IPathEntry; +import org.eclipse.jface.wizard.IWizardPage; /** * A path container page allows the user to create a new or edit an diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/IPathEntryContainerPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/IPathEntryContainerPage.java index b46ae8181d2..f0a79375865 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/IPathEntryContainerPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/IPathEntryContainerPage.java @@ -13,11 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.ui.wizards; -import org.eclipse.jface.wizard.IWizardPage; - import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.IContainerEntry; import org.eclipse.cdt.core.model.IPathEntry; +import org.eclipse.jface.wizard.IWizardPage; public interface IPathEntryContainerPage extends IWizardPage { /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizard.java index a3f34f67d64..ecb1923c7e9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizard.java @@ -16,6 +16,9 @@ package org.eclipse.cdt.ui.wizards; import java.lang.reflect.InvocationTargetException; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.internal.ui.CPluginImages; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; @@ -45,11 +48,6 @@ import org.eclipse.ui.ide.IDE; import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard; import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.CPluginImages; - /** * C Project wizard that creates a new project resource in * a location of the user's choice. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizardOptionPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizardOptionPage.java index 1bc13bb223d..b2858fe3838 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizardOptionPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizardOptionPage.java @@ -14,6 +14,8 @@ *******************************************************************************/ package org.eclipse.cdt.ui.wizards; +import org.eclipse.cdt.ui.dialogs.ICOptionContainerExtension; +import org.eclipse.cdt.ui.dialogs.TabFolderOptionBlock; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Preferences; @@ -21,9 +23,6 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.widgets.Composite; -import org.eclipse.cdt.ui.dialogs.ICOptionContainerExtension; -import org.eclipse.cdt.ui.dialogs.TabFolderOptionBlock; - /** * @deprecated as of CDT 4.0. This abstract was used for New Project Wizards * for 3.X style projects. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassCreationWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassCreationWizardPage.java index 0392a518e69..5608e93590f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassCreationWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassCreationWizardPage.java @@ -19,40 +19,6 @@ package org.eclipse.cdt.ui.wizards; import java.net.URI; import java.util.List; -import org.eclipse.core.filesystem.EFS; -import org.eclipse.core.filesystem.IFileStore; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.MultiStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.IDialogSettings; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.window.Window; -import org.eclipse.osgi.util.NLS; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.FocusEvent; -import org.eclipse.swt.events.FocusListener; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchPart; - import org.eclipse.cdt.core.CConventions; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.browser.AllTypesCache; @@ -73,9 +39,6 @@ import org.eclipse.cdt.core.model.ISourceRoot; import org.eclipse.cdt.core.parser.IScannerInfo; import org.eclipse.cdt.core.parser.IScannerInfoProvider; import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.utils.PathUtil; - import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; import org.eclipse.cdt.internal.ui.util.SWTUtil; @@ -107,6 +70,41 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.Separator; import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringButtonDialogField; import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringDialogField; import org.eclipse.cdt.internal.ui.wizards.filewizard.NewSourceFileGenerator; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.utils.PathUtil; +import org.eclipse.core.filesystem.EFS; +import org.eclipse.core.filesystem.IFileStore; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.MultiStatus; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.dialogs.IDialogSettings; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.ISelectionProvider; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.window.Window; +import org.eclipse.osgi.util.NLS; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.FocusEvent; +import org.eclipse.swt.events.FocusListener; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchPart; public class NewClassCreationWizardPage extends NewElementWizardPage { protected static final String PAGE_NAME = "NewClassWizardPage"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewSourceFolderCreationWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewSourceFolderCreationWizard.java index d1925f8acbe..93475825c9d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewSourceFolderCreationWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewSourceFolderCreationWizard.java @@ -13,15 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.ui.wizards; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; - -import org.eclipse.cdt.ui.CUIPlugin; - import org.eclipse.cdt.internal.ui.CPluginImages; import org.eclipse.cdt.internal.ui.wizards.NewElementWizard; import org.eclipse.cdt.internal.ui.wizards.folderwizard.NewFolderWizardMessages; import org.eclipse.cdt.internal.ui.wizards.folderwizard.NewSourceFolderWizardPage; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; public class NewSourceFolderCreationWizard extends NewElementWizard { private NewSourceFolderWizardPage fPage; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConversionWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConversionWizard.java index 48e0e0a074c..deb9daefc53 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConversionWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConversionWizard.java @@ -13,14 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.ui.wizards.conversion; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.wizards.NewCProjectWizard; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.IWorkbench; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.wizards.NewCProjectWizard; - /** * ConversionWizard This wizard provides a method by which the user can * change the nature of their projects. This class cannot be implemented. It diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java index 41d215f60cf..ad968200931 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java @@ -16,6 +16,14 @@ package org.eclipse.cdt.ui.wizards.conversion; import java.util.Vector; +import org.eclipse.cdt.core.CCProjectNature; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.CProjectNature; +import org.eclipse.cdt.internal.ui.CUIMessages; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.util.SWTUtil; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.runtime.CoreException; @@ -52,16 +60,6 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.ide.IDE; -import org.eclipse.cdt.core.CCProjectNature; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.CProjectNature; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.utils.ui.controls.ControlFactory; - -import org.eclipse.cdt.internal.ui.CUIMessages; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.util.SWTUtil; - /** * <p> * ConvertProjectWizardPage Standard main page for a wizard that converts a diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/internal/templateengine/wizard/TemplateCNewWizard.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/internal/templateengine/wizard/TemplateCNewWizard.java index 19dafc4855a..ce3ffc21394 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/internal/templateengine/wizard/TemplateCNewWizard.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/internal/templateengine/wizard/TemplateCNewWizard.java @@ -15,15 +15,14 @@ package org.eclipse.cdt.ui.internal.templateengine.wizard; import java.util.ArrayList; -import org.eclipse.jface.wizard.IWizard; -import org.eclipse.swt.widgets.Composite; - import org.eclipse.cdt.core.templateengine.TemplateInfo; import org.eclipse.cdt.ui.templateengine.Template; import org.eclipse.cdt.ui.templateengine.TemplateEngineUI; -import org.eclipse.cdt.ui.wizards.EntryDescriptor; import org.eclipse.cdt.ui.wizards.CNewWizard; +import org.eclipse.cdt.ui.wizards.EntryDescriptor; import org.eclipse.cdt.ui.wizards.IWizardItemsListListener; +import org.eclipse.jface.wizard.IWizard; +import org.eclipse.swt.widgets.Composite; /** * diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/ProjectSelectionPage.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/ProjectSelectionPage.java index d151ed6167a..e754ed63a0a 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/ProjectSelectionPage.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/ProjectSelectionPage.java @@ -16,6 +16,15 @@ package org.eclipse.cdt.ui.templateengine; import java.util.HashMap; import java.util.Map; +import org.eclipse.cdt.core.CCProjectNature; +import org.eclipse.cdt.core.CProjectNature; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.ui.CElementLabelProvider; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspaceRoot; @@ -46,17 +55,6 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.ElementListSelectionDialog; -import org.eclipse.cdt.core.CCProjectNature; -import org.eclipse.cdt.core.CProjectNature; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.CElementLabelProvider; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; - public class ProjectSelectionPage extends WizardPage implements IWizardDataPage { private static final String PAGE_NAME = "NewProjectSelectionWizardPage"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/Template.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/Template.java index ab1ddddde34..f287022e901 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/Template.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/Template.java @@ -19,18 +19,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.wizard.IWizard; -import org.eclipse.jface.wizard.IWizardPage; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchWizard; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.actions.WorkspaceModifyOperation; -import org.w3c.dom.Element; - import org.eclipse.cdt.core.templateengine.TemplateCore; import org.eclipse.cdt.core.templateengine.TemplateDescriptor; import org.eclipse.cdt.core.templateengine.TemplateEngine; @@ -42,6 +30,17 @@ import org.eclipse.cdt.ui.templateengine.pages.UIPagesProvider; import org.eclipse.cdt.ui.templateengine.pages.UIWizardPage; import org.eclipse.cdt.ui.templateengine.uitree.UIElementTreeBuilderHelper; import org.eclipse.cdt.ui.templateengine.uitree.UIElementTreeBuilderManager; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.wizard.IWizard; +import org.eclipse.jface.wizard.IWizardPage; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchWizard; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.actions.WorkspaceModifyOperation; +import org.w3c.dom.Element; /** * Template class is responsible for initiating GUI construction. Collecting data from GUI and diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateClassWizard.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateClassWizard.java index 5942d131c7e..d17f212888d 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateClassWizard.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateClassWizard.java @@ -17,6 +17,7 @@ import java.util.Arrays; import java.util.SortedSet; import java.util.TreeSet; +import org.eclipse.cdt.core.templateengine.TemplateCore; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExecutableExtension; @@ -24,8 +25,6 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.ui.INewWizard; import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard; -import org.eclipse.cdt.core.templateengine.TemplateCore; - public class TemplateClassWizard extends TemplatesChoiceWizard implements INewWizard, IExecutableExtension { public static final String WIZARD_ID = TemplateClassWizard.class.getName(); diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateDrivenWizard.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateDrivenWizard.java index 65c2e9a32b7..6477c4e8ada 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateDrivenWizard.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateDrivenWizard.java @@ -19,6 +19,9 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.eclipse.cdt.core.templateengine.process.ProcessFailureException; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.templateengine.pages.UIWizardPage; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.MultiStatus; @@ -28,10 +31,6 @@ import org.eclipse.jface.wizard.Wizard; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation; -import org.eclipse.cdt.core.templateengine.process.ProcessFailureException; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.templateengine.pages.UIWizardPage; - /** * Any wizard intending to use template (@see org.eclipse.cdt.core.templateenginee.Template) based pages * can extend this wizard and use it. Alternatively, a wizard intending to show a choice of templates diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateEngineUIUtil.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateEngineUIUtil.java index 6e435c9da2b..c7d030d75a6 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateEngineUIUtil.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateEngineUIUtil.java @@ -15,6 +15,9 @@ package org.eclipse.cdt.ui.templateengine; import java.util.List; +import org.eclipse.cdt.core.templateengine.TemplateEngineUtil; +import org.eclipse.cdt.core.templateengine.process.ProcessFailureException; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.MultiStatus; @@ -23,10 +26,6 @@ import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.core.templateengine.TemplateEngineUtil; -import org.eclipse.cdt.core.templateengine.process.ProcessFailureException; -import org.eclipse.cdt.ui.CUIPlugin; - public class TemplateEngineUIUtil { /** * Shows the error message in a Dialog Box. diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplatesChoiceWizard.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplatesChoiceWizard.java index a438bceebe6..8d61d888253 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplatesChoiceWizard.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplatesChoiceWizard.java @@ -20,6 +20,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.eclipse.cdt.core.templateengine.TemplateInfo; +import org.eclipse.cdt.core.templateengine.process.ProcessFailureException; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.MultiStatus; @@ -31,10 +34,6 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchWizard; import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation; -import org.eclipse.cdt.core.templateengine.TemplateInfo; -import org.eclipse.cdt.core.templateengine.process.ProcessFailureException; -import org.eclipse.cdt.ui.CUIPlugin; - /** * A wizard intending to show a choice of templates (@see org.eclipse.cdt.core.templateenginee.Template) * before switching to the pages driven by the chosen template should extend from TemplatesChoiceWizard. diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/WizardNode.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/WizardNode.java index 10028e2c8da..850dfa35643 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/WizardNode.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/WizardNode.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.ui.templateengine; import java.util.Map; +import org.eclipse.cdt.ui.templateengine.pages.UIWizardPage; import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.IWizardNode; import org.eclipse.jface.wizard.IWizardPage; @@ -23,8 +24,6 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.widgets.Composite; -import org.eclipse.cdt.ui.templateengine.pages.UIWizardPage; - /** * Wizard Node */ diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/NewProjectCreationPage.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/NewProjectCreationPage.java index cbcd01e1cbf..6fbe9ac4619 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/NewProjectCreationPage.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/NewProjectCreationPage.java @@ -16,14 +16,13 @@ package org.eclipse.cdt.ui.templateengine.pages; import java.util.HashMap; import java.util.Map; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.templateengine.IWizardDataPage; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.ui.dialogs.WizardNewProjectCreationPage; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.templateengine.IWizardDataPage; - /** * The first page in a NewProjectWizard. This is the wizard page that * asks the user for the name and location of the new project. diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/TemplateInputDialog.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/TemplateInputDialog.java index af9b76568a8..ed92eb83863 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/TemplateInputDialog.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/TemplateInputDialog.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.ui.templateengine.pages; +import org.eclipse.cdt.core.templateengine.TemplateEngineUtil; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.swt.SWT; @@ -30,8 +31,6 @@ import org.eclipse.swt.widgets.MessageBox; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.core.templateengine.TemplateEngineUtil; - /** * Creates a JFace Dialog for the user to get name-value pair to perform * SharedDefaults settings. The class takes care of user input validation. diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/TemplatePreferencePage.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/TemplatePreferencePage.java index ac2e34ec9ac..fdeb45fd73f 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/TemplatePreferencePage.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/TemplatePreferencePage.java @@ -16,6 +16,11 @@ package org.eclipse.cdt.ui.templateengine.pages; import java.util.List; +import org.eclipse.cdt.core.templateengine.SharedDefaults; +import org.eclipse.cdt.core.templateengine.TemplateEngine; +import org.eclipse.cdt.core.templateengine.TemplateEngineHelper; +import org.eclipse.cdt.core.templateengine.TemplateEngineUtil; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.jface.viewers.ColumnLayoutData; import org.eclipse.jface.viewers.ColumnWeightData; @@ -40,12 +45,6 @@ import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.PlatformUI; import org.w3c.dom.Element; -import org.eclipse.cdt.core.templateengine.SharedDefaults; -import org.eclipse.cdt.core.templateengine.TemplateEngine; -import org.eclipse.cdt.core.templateengine.TemplateEngineHelper; -import org.eclipse.cdt.core.templateengine.TemplateEngineUtil; -import org.eclipse.cdt.ui.CUIPlugin; - /** * This class represents a preference page that is contributed to the * Preferences dialog. By Provided GUI for SharedDefaults settings for the diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIPage.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIPage.java index cb13d96a57c..e4cc022fab9 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIPage.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIPage.java @@ -16,17 +16,16 @@ package org.eclipse.cdt.ui.templateengine.pages; import java.net.URL; import java.util.Map; -import org.eclipse.core.runtime.FileLocator; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.dialogs.DialogPage; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.swt.widgets.Control; - import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.templateengine.TemplateEngineUtil; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.templateengine.uitree.UIElement; import org.eclipse.cdt.ui.templateengine.uitree.uiwidgets.UIComposite; +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.Path; +import org.eclipse.jface.dialogs.DialogPage; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.swt.widgets.Control; /** * diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIWizardPage.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIWizardPage.java index 80241a9e311..bcef5c63752 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIWizardPage.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIWizardPage.java @@ -17,6 +17,11 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import org.eclipse.cdt.ui.templateengine.IWizardDataPage; +import org.eclipse.cdt.ui.templateengine.event.PatternEvent; +import org.eclipse.cdt.ui.templateengine.event.PatternEventListener; +import org.eclipse.cdt.ui.templateengine.uitree.UIElement; +import org.eclipse.cdt.ui.templateengine.uitree.uiwidgets.UIComposite; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.IWizardContainer; @@ -26,12 +31,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.ui.templateengine.IWizardDataPage; -import org.eclipse.cdt.ui.templateengine.event.PatternEvent; -import org.eclipse.cdt.ui.templateengine.event.PatternEventListener; -import org.eclipse.cdt.ui.templateengine.uitree.UIElement; -import org.eclipse.cdt.ui.templateengine.uitree.uiwidgets.UIComposite; - /** * UIWizardPage provides implementation IWizardPage. UIWizardPage is a * WizardPage. diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/processes/OpenFiles.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/processes/OpenFiles.java index f134e68b3e6..a0801fc055b 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/processes/OpenFiles.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/processes/OpenFiles.java @@ -18,7 +18,6 @@ import org.eclipse.cdt.core.templateengine.TemplateCore; import org.eclipse.cdt.core.templateengine.process.ProcessArgument; import org.eclipse.cdt.core.templateengine.process.ProcessFailureException; import org.eclipse.cdt.core.templateengine.process.ProcessRunner; - import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/UIElementTreeBuilderHelper.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/UIElementTreeBuilderHelper.java index b25373cc288..135f0f42052 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/UIElementTreeBuilderHelper.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/UIElementTreeBuilderHelper.java @@ -18,15 +18,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; - -import com.ibm.icu.text.MessageFormat; - import org.eclipse.cdt.core.templateengine.TemplateDescriptor; import org.eclipse.cdt.core.templateengine.TemplateEngine; import org.eclipse.cdt.core.templateengine.TemplateInfo; @@ -38,6 +29,14 @@ import org.eclipse.cdt.ui.templateengine.uitree.uiwidgets.UISelectWidget; import org.eclipse.cdt.ui.templateengine.uitree.uiwidgets.UISpecialListWidget; import org.eclipse.cdt.ui.templateengine.uitree.uiwidgets.UIStringListWidget; import org.eclipse.cdt.ui.templateengine.uitree.uiwidgets.UITextWidget; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; + +import com.ibm.icu.text.MessageFormat; /** * UIElementTreeBuilderHelper provides methods to convert an Element (XML) into diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/UIElementTreeBuilderManager.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/UIElementTreeBuilderManager.java index b973d7e7f0b..32710f9cb1c 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/UIElementTreeBuilderManager.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/UIElementTreeBuilderManager.java @@ -15,11 +15,10 @@ package org.eclipse.cdt.ui.templateengine.uitree; import java.util.List; -import org.w3c.dom.Element; - import org.eclipse.cdt.core.templateengine.TemplateEngine; import org.eclipse.cdt.core.templateengine.TemplateEngineUtil; import org.eclipse.cdt.ui.templateengine.SimpleElementException; +import org.w3c.dom.Element; /** * diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIBooleanWidget.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIBooleanWidget.java index cec708f1f43..3fda9a8f62a 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIBooleanWidget.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIBooleanWidget.java @@ -16,6 +16,9 @@ package org.eclipse.cdt.ui.templateengine.uitree.uiwidgets; import java.util.HashMap; import java.util.Map; +import org.eclipse.cdt.ui.templateengine.uitree.InputUIElement; +import org.eclipse.cdt.ui.templateengine.uitree.UIAttributes; +import org.eclipse.cdt.ui.templateengine.uitree.UIElement; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -25,10 +28,6 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; -import org.eclipse.cdt.ui.templateengine.uitree.InputUIElement; -import org.eclipse.cdt.ui.templateengine.uitree.UIAttributes; -import org.eclipse.cdt.ui.templateengine.uitree.UIElement; - /** * This gives a Label and Boolean widget. */ diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIBrowseWidget.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIBrowseWidget.java index 9053d152785..b7f10e5570a 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIBrowseWidget.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIBrowseWidget.java @@ -13,6 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.ui.templateengine.uitree.uiwidgets; +import org.eclipse.cdt.ui.templateengine.uitree.InputUIElement; +import org.eclipse.cdt.ui.templateengine.uitree.UIAttributes; +import org.eclipse.cdt.ui.templateengine.uitree.UIElement; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -25,10 +28,6 @@ import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.ui.templateengine.uitree.InputUIElement; -import org.eclipse.cdt.ui.templateengine.uitree.UIAttributes; -import org.eclipse.cdt.ui.templateengine.uitree.UIElement; - /** * This gives a Label and Browse widget. */ diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIComposite.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIComposite.java index a0aebaa7208..e330034a315 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIComposite.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIComposite.java @@ -16,15 +16,14 @@ package org.eclipse.cdt.ui.templateengine.uitree.uiwidgets; import java.util.Map; import java.util.Vector; +import org.eclipse.cdt.ui.templateengine.event.PatternEvent; +import org.eclipse.cdt.ui.templateengine.event.PatternEventListener; +import org.eclipse.cdt.ui.templateengine.uitree.UIElement; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; -import org.eclipse.cdt.ui.templateengine.event.PatternEvent; -import org.eclipse.cdt.ui.templateengine.event.PatternEventListener; -import org.eclipse.cdt.ui.templateengine.uitree.UIElement; - /** * By extending Composite we can create our own Container. UIComposite can act * as the bridge between the UIPage and the UIWidgets contained in that page. diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISelectWidget.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISelectWidget.java index 8310bd7ee6f..79ccc792ac7 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISelectWidget.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISelectWidget.java @@ -16,6 +16,11 @@ package org.eclipse.cdt.ui.templateengine.uitree.uiwidgets; import java.util.HashMap; import java.util.Map; +import org.eclipse.cdt.ui.templateengine.Messages; +import org.eclipse.cdt.ui.templateengine.event.PatternEvent; +import org.eclipse.cdt.ui.templateengine.uitree.InputUIElement; +import org.eclipse.cdt.ui.templateengine.uitree.UIAttributes; +import org.eclipse.cdt.ui.templateengine.uitree.UIElement; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridLayoutFactory; import org.eclipse.swt.SWT; @@ -27,12 +32,6 @@ import org.eclipse.swt.widgets.Label; import com.ibm.icu.text.MessageFormat; -import org.eclipse.cdt.ui.templateengine.Messages; -import org.eclipse.cdt.ui.templateengine.event.PatternEvent; -import org.eclipse.cdt.ui.templateengine.uitree.InputUIElement; -import org.eclipse.cdt.ui.templateengine.uitree.UIAttributes; -import org.eclipse.cdt.ui.templateengine.uitree.UIElement; - /** * This gives a Label and Combo widget. */ diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISpecialListWidget.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISpecialListWidget.java index a2575d0c0e8..f17473f34bf 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISpecialListWidget.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISpecialListWidget.java @@ -15,17 +15,16 @@ package org.eclipse.cdt.ui.templateengine.uitree.uiwidgets; import java.util.Arrays; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Label; - import org.eclipse.cdt.ui.templateengine.uitree.InputUIElement; import org.eclipse.cdt.ui.templateengine.uitree.UIAttributes; import org.eclipse.cdt.ui.templateengine.uitree.UIElement; import org.eclipse.cdt.utils.ui.controls.FileListControl; import org.eclipse.cdt.utils.ui.controls.IFileListChangeListener; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; /** * This gives a Label and UISpecialList Widget. diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIStringListWidget.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIStringListWidget.java index 463e0decaf2..4347b2f78d1 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIStringListWidget.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIStringListWidget.java @@ -21,14 +21,6 @@ import java.util.List; import java.util.Map; import java.util.StringTokenizer; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Label; - -import com.ibm.icu.text.MessageFormat; - import org.eclipse.cdt.core.templateengine.TemplateEngineHelper; import org.eclipse.cdt.ui.templateengine.event.PatternEvent; import org.eclipse.cdt.ui.templateengine.uitree.InputUIElement; @@ -36,6 +28,13 @@ import org.eclipse.cdt.ui.templateengine.uitree.UIAttributes; import org.eclipse.cdt.ui.templateengine.uitree.UIElement; import org.eclipse.cdt.utils.ui.controls.FileListControl; import org.eclipse.cdt.utils.ui.controls.IFileListChangeListener; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; + +import com.ibm.icu.text.MessageFormat; /** * This gives a Label and StringList Widget. diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UITextWidget.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UITextWidget.java index 87cc1cf3a42..1f6767c4aa9 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UITextWidget.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UITextWidget.java @@ -18,6 +18,13 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.eclipse.cdt.core.templateengine.TemplateEngineHelper; +import org.eclipse.cdt.ui.templateengine.Messages; +import org.eclipse.cdt.ui.templateengine.event.PatternEvent; +import org.eclipse.cdt.ui.templateengine.uitree.IPatternMatchingTable; +import org.eclipse.cdt.ui.templateengine.uitree.InputUIElement; +import org.eclipse.cdt.ui.templateengine.uitree.UIAttributes; +import org.eclipse.cdt.ui.templateengine.uitree.UIElement; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -27,14 +34,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.eclipse.cdt.core.templateengine.TemplateEngineHelper; -import org.eclipse.cdt.ui.templateengine.Messages; -import org.eclipse.cdt.ui.templateengine.event.PatternEvent; -import org.eclipse.cdt.ui.templateengine.uitree.IPatternMatchingTable; -import org.eclipse.cdt.ui.templateengine.uitree.InputUIElement; -import org.eclipse.cdt.ui.templateengine.uitree.UIAttributes; -import org.eclipse.cdt.ui.templateengine.uitree.UIElement; - /** * This gives a Label and Text widget. The Text widget can be SINGLE type of * MULTI type. This depends on the input type in TemplateDescriptor. The data diff --git a/core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/FileListControl.java b/core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/FileListControl.java index 8d8c3270bd1..84eeb5e162b 100644 --- a/core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/FileListControl.java +++ b/core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/FileListControl.java @@ -18,6 +18,19 @@ package org.eclipse.cdt.utils.ui.controls; import java.util.ArrayList; import java.util.Arrays; +import org.eclipse.cdt.core.cdtvariables.CdtVariableException; +import org.eclipse.cdt.core.cdtvariables.ICdtVariable; +import org.eclipse.cdt.internal.core.resources.ResourceLookup; +import org.eclipse.cdt.internal.ui.newui.Messages; +import org.eclipse.cdt.ui.CDTSharedImages; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.newui.CDTStatusInfo; +import org.eclipse.cdt.ui.newui.TypedCDTViewerFilter; +import org.eclipse.cdt.utils.cdtvariables.CdtVariableResolver; +import org.eclipse.cdt.utils.cdtvariables.IVariableContextInfo; +import org.eclipse.cdt.utils.cdtvariables.IVariableSubstitutor; +import org.eclipse.cdt.utils.cdtvariables.SupplierBasedCdtVariableManager; +import org.eclipse.cdt.utils.cdtvariables.SupplierBasedCdtVariableSubstitutor; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.operations.AbstractOperation; import org.eclipse.core.commands.operations.IOperationHistory; @@ -81,22 +94,6 @@ import org.eclipse.ui.model.WorkbenchLabelProvider; import org.eclipse.ui.swt.IFocusService; import org.eclipse.ui.views.navigator.ResourceComparator; -import org.eclipse.cdt.core.cdtvariables.CdtVariableException; -import org.eclipse.cdt.core.cdtvariables.ICdtVariable; -import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.newui.CDTStatusInfo; -import org.eclipse.cdt.ui.newui.TypedCDTViewerFilter; -import org.eclipse.cdt.utils.cdtvariables.CdtVariableResolver; -import org.eclipse.cdt.utils.cdtvariables.IVariableContextInfo; -import org.eclipse.cdt.utils.cdtvariables.IVariableSubstitutor; -import org.eclipse.cdt.utils.cdtvariables.SupplierBasedCdtVariableManager; -import org.eclipse.cdt.utils.cdtvariables.SupplierBasedCdtVariableSubstitutor; - -import org.eclipse.cdt.internal.core.resources.ResourceLookup; - -import org.eclipse.cdt.internal.ui.newui.Messages; - /** * Instances of this class allow the user to add, remove, delete, moveup and movedown * the items in the list control. diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/BreakpointActionManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/BreakpointActionManager.java index 7977271b034..bc5778d3dc9 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/BreakpointActionManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/BreakpointActionManager.java @@ -16,6 +16,7 @@ package org.eclipse.cdt.debug.core.breakpointactions; import java.io.ByteArrayOutputStream; import java.io.StringReader; import java.util.ArrayList; + import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.OutputKeys; @@ -33,8 +34,8 @@ import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.debug.core.model.IBreakpoint; import org.w3c.dom.Document; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ProgramRelativePathSourceContainer.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ProgramRelativePathSourceContainer.java index 5edaffcacd9..1800e60bed4 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ProgramRelativePathSourceContainer.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ProgramRelativePathSourceContainer.java @@ -14,6 +14,7 @@ package org.eclipse.cdt.debug.core.sourcelookup; import java.io.File; + import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.IBinary; import org.eclipse.cdt.core.model.ICProject; @@ -21,14 +22,14 @@ import org.eclipse.cdt.debug.core.CDebugCorePlugin; import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; -import org.eclipse.debug.core.sourcelookup.ISourceContainerType; -import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector; -import org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainer; -import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.core.variables.VariablesPlugin; import org.eclipse.debug.core.ILaunchConfiguration; +import org.eclipse.debug.core.sourcelookup.ISourceContainerType; +import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector; +import org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainer; +import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage; /** * A source container that converts relative paths to absolute ones using the diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointNotifier.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointNotifier.java index 756445aae91..18c4f44c6df 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointNotifier.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointNotifier.java @@ -14,6 +14,7 @@ package org.eclipse.cdt.debug.internal.core; import java.util.Map; + import org.eclipse.cdt.debug.core.CDebugCorePlugin; import org.eclipse.cdt.debug.core.ICBreakpointListener; import org.eclipse.debug.core.model.IBreakpoint; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/BreakpointProblems.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/BreakpointProblems.java index 4075d4c4de9..035cc5cd504 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/BreakpointProblems.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/BreakpointProblems.java @@ -14,8 +14,6 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.core.breakpoints; -import com.ibm.icu.text.MessageFormat; - import org.eclipse.cdt.core.ProblemMarkerInfo; import org.eclipse.cdt.core.model.ICModelMarker; import org.eclipse.cdt.debug.core.CDebugCorePlugin; @@ -25,6 +23,8 @@ import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; +import com.ibm.icu.text.MessageFormat; + public class BreakpointProblems { /** diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionDynamicPrintf.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionDynamicPrintf.java index d401eb8fd1c..9c5fc8d1403 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionDynamicPrintf.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionDynamicPrintf.java @@ -16,8 +16,8 @@ package org.eclipse.cdt.debug.internal.core.breakpoints; import java.util.Map; import org.eclipse.cdt.debug.core.CDebugUtils; -import org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint; import org.eclipse.cdt.debug.core.model.ICDynamicPrintf; +import org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java index 49781cca6f3..c475621c429 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java @@ -15,14 +15,16 @@ package org.eclipse.cdt.debug.internal.core.breakpoints; import java.math.BigInteger; -import com.ibm.icu.text.MessageFormat; import java.util.Map; + import org.eclipse.cdt.debug.core.CDebugUtils; import org.eclipse.cdt.debug.core.model.ICWatchpoint2; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; +import com.ibm.icu.text.MessageFormat; + /** * A watchpoint specific to the C/C++ debug model. */ diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CompilationDirectorySourceContainer.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CompilationDirectorySourceContainer.java index 5a74b3dacc6..dbe1584f16f 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CompilationDirectorySourceContainer.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CompilationDirectorySourceContainer.java @@ -20,6 +20,7 @@ import java.util.List; import org.eclipse.cdt.debug.core.CDebugCorePlugin; import org.eclipse.cdt.debug.core.sourcelookup.IMappingSourceContainer; +import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/SourceUtils.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/SourceUtils.java index 48580bf6b30..b8b81e632c9 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/SourceUtils.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/SourceUtils.java @@ -17,7 +17,6 @@ package org.eclipse.cdt.debug.internal.core.sourcelookup; import java.io.File; import java.io.IOException; import java.io.StringReader; -import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedList; @@ -63,6 +62,8 @@ import org.w3c.dom.NodeList; import org.xml.sax.InputSource; import org.xml.sax.SAXException; +import com.ibm.icu.text.MessageFormat; + public class SourceUtils { private static final String NAME_COMMON_SOURCE_LOCATIONS = "commonSourceLocations"; //$NON-NLS-1$ private static final String NAME_SOURCE_LOCATION = "sourceLocation"; //$NON-NLS-1$ diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/DebugMarkerAnnotationModel.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/DebugMarkerAnnotationModel.java index ff5aea57e39..49deab3a8b3 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/DebugMarkerAnnotationModel.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/DebugMarkerAnnotationModel.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.debug.internal.ui; import java.io.File; + import org.eclipse.cdt.debug.core.model.ICBreakpoint; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IMarkerDelta; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/DebugMarkerAnnotationModelFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/DebugMarkerAnnotationModelFactory.java index bf44654223e..854d662820e 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/DebugMarkerAnnotationModelFactory.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/DebugMarkerAnnotationModelFactory.java @@ -14,6 +14,7 @@ package org.eclipse.cdt.debug.internal.ui; import java.io.File; + import org.eclipse.core.filebuffers.FileBuffers; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IPath; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/HTMLPrinter.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/HTMLPrinter.java index eb85db4bb6f..d1a342917a7 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/HTMLPrinter.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/HTMLPrinter.java @@ -19,7 +19,6 @@ import java.io.Reader; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.widgets.Display; - import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractListenerActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractListenerActionDelegate.java index d190e863371..88578e57af2 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractListenerActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractListenerActionDelegate.java @@ -20,8 +20,10 @@ import org.eclipse.jface.action.IAction; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IActionDelegate2; +import org.eclipse.ui.IViewActionDelegate; import org.eclipse.ui.IViewPart; import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.IWorkbenchWindowActionDelegate; public abstract class AbstractListenerActionDelegate extends AbstractDebugActionDelegate implements IDebugEventSetListener, IActionDelegate2 { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CastToArrayActionHandler.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CastToArrayActionHandler.java index 8aace289b5f..513ea86bc58 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CastToArrayActionHandler.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CastToArrayActionHandler.java @@ -22,6 +22,10 @@ import org.eclipse.cdt.debug.core.model.ICastToArray; import org.eclipse.cdt.debug.internal.ui.CDebugImages; import org.eclipse.cdt.debug.ui.CDebugUIPlugin; import org.eclipse.cdt.utils.ui.controls.ControlFactory; +import org.eclipse.core.commands.AbstractHandler; +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.expressions.IEvaluationContext; import org.eclipse.core.runtime.IStatus; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.DebugPlugin; @@ -49,10 +53,6 @@ import org.eclipse.ui.ISources; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.handlers.HandlerUtil; -import org.eclipse.core.commands.AbstractHandler; -import org.eclipse.core.commands.ExecutionEvent; -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.expressions.IEvaluationContext; /** * The delegate of the "Display As Array" action. diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/breakpoints/BreakpointComboFieldEditor.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/breakpoints/BreakpointComboFieldEditor.java index d9b56901375..3def859d08f 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/breakpoints/BreakpointComboFieldEditor.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/breakpoints/BreakpointComboFieldEditor.java @@ -16,6 +16,7 @@ package org.eclipse.cdt.debug.internal.ui.breakpoints; import org.eclipse.cdt.debug.internal.ui.preferences.ComboFieldEditor; import org.eclipse.cdt.debug.ui.breakpoints.ICBreakpointsUIContribution; import org.eclipse.cdt.debug.ui.breakpoints.ICBreakpointsUIContributionUser; +import org.eclipse.jface.preference.FieldEditor; import org.eclipse.swt.widgets.Composite; /** diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/ModuleProperties.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/ModuleProperties.java index 19342e60709..71c66b73620 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/ModuleProperties.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/ModuleProperties.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.debug.internal.ui.propertypages; import java.util.ArrayList; import java.util.Iterator; + import org.eclipse.cdt.debug.core.model.ICModule; /** diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java index e3de03bd6a8..8d91acf5d39 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java @@ -14,6 +14,7 @@ package org.eclipse.cdt.debug.internal.ui.sourcelookup; import java.util.ArrayList; + import org.eclipse.cdt.debug.internal.ui.ICDebugHelpContextIds; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.sourcelookup.ISourceContainer; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CompilationDirectorySourceContainerBrowser.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CompilationDirectorySourceContainerBrowser.java index 144ffc7f4ca..64012454871 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CompilationDirectorySourceContainerBrowser.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CompilationDirectorySourceContainerBrowser.java @@ -13,11 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.debug.internal.ui.sourcelookup; +import org.eclipse.cdt.debug.internal.core.sourcelookup.CompilationDirectorySourceContainer; import org.eclipse.core.runtime.Path; import org.eclipse.debug.core.sourcelookup.ISourceContainer; import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector; import org.eclipse.debug.ui.sourcelookup.AbstractSourceContainerBrowser; -import org.eclipse.cdt.debug.internal.core.sourcelookup.CompilationDirectorySourceContainer; import org.eclipse.jface.window.Window; import org.eclipse.swt.widgets.Shell; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/DownAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/DownAction.java index c227e78d44f..5c06f6fbd7f 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/DownAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/DownAction.java @@ -16,7 +16,9 @@ package org.eclipse.cdt.debug.internal.ui.sourcelookup; import java.util.List; import org.eclipse.debug.core.sourcelookup.ISourceContainer; +import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ui.actions.SelectionListenerAction; /** * The action for sorting the order of source containers in the dialog. diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/EditContainerAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/EditContainerAction.java index 424c6ba2a0a..ac12d7146b8 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/EditContainerAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/EditContainerAction.java @@ -14,6 +14,7 @@ package org.eclipse.cdt.debug.internal.ui.sourcelookup; import java.util.Iterator; + import org.eclipse.debug.core.sourcelookup.ISourceContainer; import org.eclipse.debug.core.sourcelookup.ISourceContainerType; import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/RemoveAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/RemoveAction.java index 8fab39f42b3..c817bfb6d7c 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/RemoveAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/RemoveAction.java @@ -16,7 +16,9 @@ package org.eclipse.cdt.debug.internal.ui.sourcelookup; import java.util.List; import org.eclipse.debug.core.sourcelookup.ISourceContainer; +import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ui.actions.SelectionListenerAction; /** * The action used to remove source containers in the source location dialog/tab. diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerAction.java index 950e36da6f7..9bd3e26e5e4 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerAction.java @@ -18,6 +18,7 @@ import java.util.Iterator; import java.util.List; import org.eclipse.debug.core.sourcelookup.ISourceContainer; +import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerViewer.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerViewer.java index 51a26be6e93..606589bf69c 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerViewer.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerViewer.java @@ -15,8 +15,11 @@ package org.eclipse.cdt.debug.internal.ui.sourcelookup; import java.util.ArrayList; import java.util.List; + import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.sourcelookup.ISourceContainer; +import org.eclipse.jface.viewers.IContentProvider; +import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.StructuredSelection; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerWorkbenchAdapter.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerWorkbenchAdapter.java index 57066a57395..9db79958a92 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerWorkbenchAdapter.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerWorkbenchAdapter.java @@ -14,6 +14,7 @@ package org.eclipse.cdt.debug.internal.ui.sourcelookup; import java.io.File; + import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/UpAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/UpAction.java index 288ba46741e..a7705d801f6 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/UpAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/UpAction.java @@ -16,7 +16,9 @@ package org.eclipse.cdt.debug.internal.ui.sourcelookup; import java.util.List; import org.eclipse.debug.core.sourcelookup.ISourceContainer; +import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ui.actions.SelectionListenerAction; /** * The action used to move source containers up in the list diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/AbstractDebugEventHandlerView.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/AbstractDebugEventHandlerView.java index e485208e6d0..dca52db9dd5 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/AbstractDebugEventHandlerView.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/AbstractDebugEventHandlerView.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.debug.internal.ui.views; import org.eclipse.debug.ui.AbstractDebugView; import org.eclipse.jface.action.IStatusLineManager; +import org.eclipse.ui.IWorkbenchPart; /** * A debug view that uses an event handler to update its diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesLabelProvider.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesLabelProvider.java index 4939bee2e57..c3581dfa31c 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesLabelProvider.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesLabelProvider.java @@ -14,8 +14,6 @@ package org.eclipse.cdt.debug.internal.ui.views.executables; -import com.ibm.icu.text.DateFormat; - import java.util.Date; import java.util.List; @@ -35,6 +33,8 @@ import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.widgets.Display; +import com.ibm.icu.text.DateFormat; + public class SourceFilesLabelProvider extends TreeColumnViewerLabelProvider implements IExecutablesChangeListener { private SourceFilesViewer viewer; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/CLICommandActionPage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/CLICommandActionPage.java index 90c7331651a..eacf483791b 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/CLICommandActionPage.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/CLICommandActionPage.java @@ -14,7 +14,6 @@ package org.eclipse.cdt.debug.ui.breakpointactions; import org.eclipse.cdt.debug.core.breakpointactions.IBreakpointAction; -import org.eclipse.cdt.debug.ui.breakpointactions.IBreakpointActionPage; import org.eclipse.core.runtime.PlatformObject; import org.eclipse.swt.widgets.Composite; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogAction.java index 51f5aa990bc..2bf8a61bd1f 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogAction.java @@ -15,7 +15,6 @@ package org.eclipse.cdt.debug.ui.breakpointactions; import java.io.ByteArrayOutputStream; import java.io.StringReader; -import com.ibm.icu.text.MessageFormat; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -43,6 +42,8 @@ import org.w3c.dom.Element; import org.xml.sax.InputSource; import org.xml.sax.helpers.DefaultHandler; +import com.ibm.icu.text.MessageFormat; + public class LogAction extends AbstractBreakpointAction { private String message = ""; //$NON-NLS-1$ diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeAction.java index 805bd98dff3..ffbb3b3e342 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeAction.java @@ -15,7 +15,6 @@ package org.eclipse.cdt.debug.ui.breakpointactions; import java.io.ByteArrayOutputStream; import java.io.StringReader; -import com.ibm.icu.text.MessageFormat; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -42,6 +41,8 @@ import org.w3c.dom.Element; import org.xml.sax.InputSource; import org.xml.sax.helpers.DefaultHandler; +import com.ibm.icu.text.MessageFormat; + public class ResumeAction extends AbstractBreakpointAction { final static int INCRIMENT_MSEC = 100; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundAction.java index 5a9ec18a185..5f0963b84ec 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundAction.java @@ -17,7 +17,6 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.io.StringReader; -import com.ibm.icu.text.MessageFormat; import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioInputStream; @@ -47,6 +46,8 @@ import org.w3c.dom.Element; import org.xml.sax.InputSource; import org.xml.sax.helpers.DefaultHandler; +import com.ibm.icu.text.MessageFormat; + public class SoundAction extends AbstractBreakpointAction { static public void playSoundFile(final File soundFile) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/disassembly/rulers/AbstractContributedRulerColumn.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/disassembly/rulers/AbstractContributedRulerColumn.java index 626fd52106b..3f98aac3049 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/disassembly/rulers/AbstractContributedRulerColumn.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/disassembly/rulers/AbstractContributedRulerColumn.java @@ -16,7 +16,6 @@ package org.eclipse.cdt.debug.ui.disassembly.rulers; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IConfigurationElement; - import org.eclipse.ui.IWorkbenchPart; /** diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/DefaultSourceLocator.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/DefaultSourceLocator.java index c4aeee5b380..e2082d13c64 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/DefaultSourceLocator.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/DefaultSourceLocator.java @@ -17,6 +17,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.List; + import org.eclipse.cdt.debug.core.CDebugUtils; import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation; import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/ui/test/AutomatedIntegrationSuite.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/ui/test/AutomatedIntegrationSuite.java index d20faee1b3b..3f6bba2532b 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/ui/test/AutomatedIntegrationSuite.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/ui/test/AutomatedIntegrationSuite.java @@ -13,7 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.test; -import org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.test.PersistentSettingsManagerTest; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/ui/test/VisualizerVirtualBoundsGraphicObjectTest.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/ui/test/VisualizerVirtualBoundsGraphicObjectTest.java index be0cb0beb59..c2ab70aaec8 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/ui/test/VisualizerVirtualBoundsGraphicObjectTest.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/ui/test/VisualizerVirtualBoundsGraphicObjectTest.java @@ -17,8 +17,8 @@ *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.test; -import org.eclipse.swt.graphics.Rectangle; import org.eclipse.cdt.visualizer.ui.canvas.VirtualBoundsGraphicObject; +import org.eclipse.swt.graphics.Rectangle; import org.junit.Test; public class VisualizerVirtualBoundsGraphicObjectTest { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/mi/service/command/output/MIStringHandlerTests.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/mi/service/command/output/MIStringHandlerTests.java index 74aa656cb0b..6e0a599791e 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/mi/service/command/output/MIStringHandlerTests.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/mi/service/command/output/MIStringHandlerTests.java @@ -19,10 +19,10 @@ import static org.junit.Assert.fail; import java.text.ParseException; -import junit.framework.JUnit4TestAdapter; - import org.junit.Test; +import junit.framework.JUnit4TestAdapter; + public class MIStringHandlerTests { @Test public void testTranscodeString() { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbStartTracingCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbStartTracingCommand.java index 2260aee8f77..89f5dee0334 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbStartTracingCommand.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbStartTracingCommand.java @@ -24,8 +24,8 @@ import org.eclipse.cdt.dsf.concurrent.Query; import org.eclipse.cdt.dsf.datamodel.DMContexts; import org.eclipse.cdt.dsf.gdb.internal.ui.GdbUIPlugin; import org.eclipse.cdt.dsf.gdb.service.IGDBTraceControl; -import org.eclipse.cdt.dsf.gdb.service.IGDBTraceControl2; import org.eclipse.cdt.dsf.gdb.service.IGDBTraceControl.ITraceTargetDMContext; +import org.eclipse.cdt.dsf.gdb.service.IGDBTraceControl2; import org.eclipse.cdt.dsf.service.DsfServicesTracker; import org.eclipse.cdt.dsf.service.DsfSession; import org.eclipse.cdt.dsf.ui.viewmodel.datamodel.IDMVMContext; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/AttachProcessHandler.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/AttachProcessHandler.java index a6d78b9f6ba..1849e4c3ba6 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/AttachProcessHandler.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/AttachProcessHandler.java @@ -29,8 +29,8 @@ import org.eclipse.cdt.dsf.debug.service.IProcesses.IProcessDMContext; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService; 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.IGDBProcesses; import org.eclipse.cdt.dsf.gdb.service.IGDBHardwareAndOS2.IResourcesInformation; +import org.eclipse.cdt.dsf.gdb.service.IGDBProcesses; import org.eclipse.cdt.dsf.service.DsfServicesTracker; import org.eclipse.cdt.dsf.service.DsfSession; import org.eclipse.core.commands.AbstractHandler; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchMessages.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchMessages.java index 348fecdbf97..aa2b39be682 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchMessages.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchMessages.java @@ -15,10 +15,11 @@ *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.launching; -import com.ibm.icu.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; +import com.ibm.icu.text.MessageFormat; + public class LaunchMessages { private static final String BUNDLE_NAME = "org.eclipse.cdt.dsf.gdb.launching.LaunchMessages";//$NON-NLS-1$ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/ServicesLaunchSequence.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/ServicesLaunchSequence.java index 79a9ed0ba1f..aa8ef48cc79 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/ServicesLaunchSequence.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/ServicesLaunchSequence.java @@ -32,8 +32,8 @@ import org.eclipse.cdt.dsf.debug.service.ISourceLookup; import org.eclipse.cdt.dsf.debug.service.ISourceLookup.ISourceLookupDMContext; import org.eclipse.cdt.dsf.debug.service.IStack; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService; -import org.eclipse.cdt.dsf.gdb.service.IGDBHardwareAndOS; import org.eclipse.cdt.dsf.gdb.internal.service.IGDBFocusSynchronizer; +import org.eclipse.cdt.dsf.gdb.service.IGDBHardwareAndOS; import org.eclipse.cdt.dsf.gdb.service.IGDBTraceControl; import org.eclipse.cdt.dsf.mi.service.CSourceLookup; import org.eclipse.cdt.dsf.mi.service.IMIBackend; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpointsManager_7_0.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpointsManager_7_0.java index bf1cd6965ab..befd2a9ec12 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpointsManager_7_0.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpointsManager_7_0.java @@ -19,8 +19,8 @@ import org.eclipse.cdt.debug.core.model.ICBreakpoint; import org.eclipse.cdt.dsf.concurrent.ImmediateRequestMonitor; import org.eclipse.cdt.dsf.concurrent.RequestMonitor; import org.eclipse.cdt.dsf.datamodel.DMContexts; -import org.eclipse.cdt.dsf.debug.service.IDsfBreakpointExtension; import org.eclipse.cdt.dsf.debug.service.IBreakpoints.IBreakpointsTargetDMContext; +import org.eclipse.cdt.dsf.debug.service.IDsfBreakpointExtension; import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerDMContext; import org.eclipse.cdt.dsf.debug.service.IRunControl.IStartedDMEvent; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/breakpoint/actions/MILogActionEnabler.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/breakpoint/actions/MILogActionEnabler.java index fde8f4b76c1..b0ccfdb0bee 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/breakpoint/actions/MILogActionEnabler.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/breakpoint/actions/MILogActionEnabler.java @@ -22,8 +22,8 @@ import org.eclipse.cdt.dsf.concurrent.DsfExecutor; import org.eclipse.cdt.dsf.concurrent.Query; import org.eclipse.cdt.dsf.datamodel.IDMContext; import org.eclipse.cdt.dsf.debug.service.IExpressions; -import org.eclipse.cdt.dsf.debug.service.IFormattedValues; import org.eclipse.cdt.dsf.debug.service.IExpressions.IExpressionDMContext; +import org.eclipse.cdt.dsf.debug.service.IFormattedValues; import org.eclipse.cdt.dsf.debug.service.IFormattedValues.FormattedValueDMContext; import org.eclipse.cdt.dsf.debug.service.IFormattedValues.FormattedValueDMData; import org.eclipse.cdt.dsf.service.DsfServicesTracker; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIInfoRecord.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIInfoRecord.java index 480e3cb2c48..7d6d90f5d8e 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIInfoRecord.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIInfoRecord.java @@ -14,9 +14,9 @@ package org.eclipse.cdt.dsf.mi.service.command.commands; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; +import org.eclipse.cdt.dsf.mi.service.command.output.CLIInfoRecordInfo; 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.mi.service.command.output.CLIInfoRecordInfo; /** * @since 5.0 diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIRecord.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIRecord.java index b3e54912916..4333f7b8686 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIRecord.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIRecord.java @@ -14,9 +14,9 @@ *******************************************************************************/ package org.eclipse.cdt.dsf.mi.service.command.commands; +import org.eclipse.cdt.debug.core.model.IChangeReverseMethodHandler.ReverseDebugMethod; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo; -import org.eclipse.cdt.debug.core.model.IChangeReverseMethodHandler.ReverseDebugMethod; /** * This command turns on on off the recording of "Process Record and Replay". diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLITraceDump.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLITraceDump.java index 453edd3a7bf..7dc3ff962ab 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLITraceDump.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLITraceDump.java @@ -14,8 +14,8 @@ package org.eclipse.cdt.dsf.mi.service.command.commands; import org.eclipse.cdt.dsf.gdb.service.IGDBTraceControl.ITraceRecordDMContext; -import org.eclipse.cdt.dsf.mi.service.command.output.MIOutput; import org.eclipse.cdt.dsf.mi.service.command.output.CLITraceDumpInfo; +import org.eclipse.cdt.dsf.mi.service.command.output.MIOutput; /** * GDB tdump CLI command. diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetArgs.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetArgs.java index dd0be3df3cc..7c4497eb694 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetArgs.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetArgs.java @@ -17,6 +17,7 @@ package org.eclipse.cdt.dsf.mi.service.command.commands; import java.util.ArrayList; + import org.eclipse.cdt.dsf.mi.service.IMIContainerDMContext; import org.eclipse.cdt.utils.CommandLineUtil; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBShowLanguage.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBShowLanguage.java index fb05706be49..d76b2f5a1df 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBShowLanguage.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBShowLanguage.java @@ -14,8 +14,8 @@ package org.eclipse.cdt.dsf.mi.service.command.commands; import org.eclipse.cdt.dsf.datamodel.IDMContext; -import org.eclipse.cdt.dsf.mi.service.command.output.MIOutput; import org.eclipse.cdt.dsf.mi.service.command.output.MIGDBShowLanguageInfo; +import org.eclipse.cdt.dsf.mi.service.command.output.MIOutput; /** * diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIInfoOs.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIInfoOs.java index 736c10e0241..75fc595b6c6 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIInfoOs.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIInfoOs.java @@ -15,7 +15,6 @@ package org.eclipse.cdt.dsf.mi.service.command.commands; import org.eclipse.cdt.dsf.datamodel.IDMContext; -import org.eclipse.cdt.dsf.mi.service.command.commands.MICommand; import org.eclipse.cdt.dsf.mi.service.command.output.MIInfoOsInfo; import org.eclipse.cdt.dsf.mi.service.command.output.MIOutput; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIGDBVersionInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIGDBVersionInfo.java index 208947ff3d1..1dfe75784a4 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIGDBVersionInfo.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIGDBVersionInfo.java @@ -15,11 +15,6 @@ package org.eclipse.cdt.dsf.mi.service.command.output; import org.eclipse.cdt.dsf.gdb.launching.LaunchUtils; -import org.eclipse.cdt.dsf.mi.service.command.output.MIConsoleStreamOutput; -import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo; -import org.eclipse.cdt.dsf.mi.service.command.output.MIOOBRecord; -import org.eclipse.cdt.dsf.mi.service.command.output.MIOutput; -import org.eclipse.cdt.dsf.mi.service.command.output.MIStreamRecord; /** * '-gdb-version' Show version information for gdb. diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/Intermittent.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/Intermittent.java index 9ef0c87ca4e..2d4f2bc6244 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/Intermittent.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/Intermittent.java @@ -13,12 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.tests.dsf.gdb.framework; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + @Target({ METHOD, TYPE }) @Retention(RUNTIME) public @interface Intermittent { diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/MoveToLine.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/MoveToLine.java index 351438eb986..cb55025b976 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/MoveToLine.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/MoveToLine.java @@ -24,8 +24,8 @@ import org.eclipse.cdt.debug.core.model.IMoveToLine; import org.eclipse.cdt.dsf.concurrent.DataRequestMonitor; import org.eclipse.cdt.dsf.concurrent.IDsfStatusConstants; import org.eclipse.cdt.dsf.concurrent.Query; -import org.eclipse.cdt.dsf.debug.service.IRunControl2; import org.eclipse.cdt.dsf.debug.service.IRunControl.IExecutionDMContext; +import org.eclipse.cdt.dsf.debug.service.IRunControl2; import org.eclipse.cdt.dsf.internal.ui.DsfUIPlugin; import org.eclipse.cdt.dsf.service.DsfServicesTracker; import org.eclipse.cdt.dsf.service.DsfSession; diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/ResumeAtLine.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/ResumeAtLine.java index d08c8d3f5e5..9f388774a1a 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/ResumeAtLine.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/ResumeAtLine.java @@ -24,8 +24,8 @@ import org.eclipse.cdt.debug.core.model.IResumeAtLine; import org.eclipse.cdt.dsf.concurrent.DataRequestMonitor; import org.eclipse.cdt.dsf.concurrent.IDsfStatusConstants; import org.eclipse.cdt.dsf.concurrent.Query; -import org.eclipse.cdt.dsf.debug.service.IRunControl2; import org.eclipse.cdt.dsf.debug.service.IRunControl.IExecutionDMContext; +import org.eclipse.cdt.dsf.debug.service.IRunControl2; import org.eclipse.cdt.dsf.internal.ui.DsfUIPlugin; import org.eclipse.cdt.dsf.service.DsfServicesTracker; import org.eclipse.cdt.dsf.service.DsfSession; diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RunToLine.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RunToLine.java index 956f40ee29a..f40fa3b7bb6 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RunToLine.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RunToLine.java @@ -25,8 +25,8 @@ import org.eclipse.cdt.debug.core.model.IRunToLine; import org.eclipse.cdt.dsf.concurrent.DataRequestMonitor; import org.eclipse.cdt.dsf.concurrent.IDsfStatusConstants; import org.eclipse.cdt.dsf.concurrent.Query; -import org.eclipse.cdt.dsf.debug.service.IRunControl2; import org.eclipse.cdt.dsf.debug.service.IRunControl.IExecutionDMContext; +import org.eclipse.cdt.dsf.debug.service.IRunControl2; import org.eclipse.cdt.dsf.internal.ui.DsfUIPlugin; import org.eclipse.cdt.dsf.service.DsfServicesTracker; import org.eclipse.cdt.dsf.service.DsfSession; diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyDropAdapter.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyDropAdapter.java index fa4487cc42e..994ee6300f4 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyDropAdapter.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyDropAdapter.java @@ -13,7 +13,12 @@ *******************************************************************************/ package org.eclipse.cdt.dsf.debug.internal.ui.disassembly; -import org.eclipse.swt.dnd.*; +import org.eclipse.swt.dnd.DND; +import org.eclipse.swt.dnd.DropTargetAdapter; +import org.eclipse.swt.dnd.DropTargetEvent; +import org.eclipse.swt.dnd.FileTransfer; +import org.eclipse.swt.dnd.TextTransfer; +import org.eclipse.swt.dnd.TransferData; /** * DisassemblyDropAdapter diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/EditionFinderJob.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/EditionFinderJob.java index 8874640a7d3..7020e606781 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/EditionFinderJob.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/EditionFinderJob.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.dsf.debug.internal.ui.disassembly; +import static org.eclipse.cdt.debug.internal.ui.disassembly.dsf.DisassemblyUtils.internalError; + import java.math.BigInteger; import org.eclipse.cdt.dsf.debug.internal.ui.disassembly.model.SourceFileInfo; @@ -25,7 +27,6 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.core.runtime.jobs.Job; -import static org.eclipse.cdt.debug.internal.ui.disassembly.dsf.DisassemblyUtils.internalError; /** * A job to find a suitable edition from the local history diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/util/StorageEditorInput.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/util/StorageEditorInput.java index ada4e152065..10c56b115cb 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/util/StorageEditorInput.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/util/StorageEditorInput.java @@ -16,6 +16,7 @@ package org.eclipse.cdt.dsf.debug.internal.ui.disassembly.util; import org.eclipse.core.resources.IStorage; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IPersistableElement; import org.eclipse.ui.IStorageEditorInput; diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/AbstractDsfDebugTextHover.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/AbstractDsfDebugTextHover.java index 20c91140d3f..b8fbf964aa2 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/AbstractDsfDebugTextHover.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/AbstractDsfDebugTextHover.java @@ -23,8 +23,8 @@ import org.eclipse.cdt.dsf.concurrent.IDsfStatusConstants; import org.eclipse.cdt.dsf.concurrent.Query; import org.eclipse.cdt.dsf.debug.internal.ui.ExpressionInformationControlCreator; import org.eclipse.cdt.dsf.debug.service.IExpressions; -import org.eclipse.cdt.dsf.debug.service.IFormattedValues; import org.eclipse.cdt.dsf.debug.service.IExpressions.IExpressionDMContext; +import org.eclipse.cdt.dsf.debug.service.IFormattedValues; import org.eclipse.cdt.dsf.debug.service.IFormattedValues.FormattedValueDMContext; import org.eclipse.cdt.dsf.debug.service.IFormattedValues.FormattedValueDMData; import org.eclipse.cdt.dsf.debug.service.IStack.IFrameDMContext; diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/ModulesVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/ModulesVMNode.java index bcbff3d2307..6addf86c22e 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/ModulesVMNode.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/ModulesVMNode.java @@ -22,10 +22,10 @@ import org.eclipse.cdt.dsf.concurrent.DsfRunnable; import org.eclipse.cdt.dsf.concurrent.RequestMonitor; import org.eclipse.cdt.dsf.datamodel.IDMContext; import org.eclipse.cdt.dsf.debug.service.IModules; -import org.eclipse.cdt.dsf.debug.service.IRunControl; import org.eclipse.cdt.dsf.debug.service.IModules.IModuleDMContext; import org.eclipse.cdt.dsf.debug.service.IModules.IModuleDMData; import org.eclipse.cdt.dsf.debug.service.IModules.ISymbolDMContext; +import org.eclipse.cdt.dsf.debug.service.IRunControl; import org.eclipse.cdt.dsf.debug.ui.IDsfDebugUIConstants; import org.eclipse.cdt.dsf.internal.ui.DsfUILabelImage; import org.eclipse.cdt.dsf.service.DsfSession; diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableCellModifier.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableCellModifier.java index b03d4578061..a7a02aaacf3 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableCellModifier.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableCellModifier.java @@ -15,8 +15,8 @@ package org.eclipse.cdt.dsf.debug.ui.viewmodel.variable; import org.eclipse.cdt.dsf.concurrent.DsfRunnable; -import org.eclipse.cdt.dsf.debug.service.IFormattedValues; import org.eclipse.cdt.dsf.debug.service.IExpressions.IExpressionDMContext; +import org.eclipse.cdt.dsf.debug.service.IFormattedValues; import org.eclipse.cdt.dsf.debug.ui.viewmodel.IDebugVMConstants; import org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.WatchExpressionCellModifier; import org.eclipse.cdt.dsf.ui.viewmodel.IVMContext; diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMChildrenCountUpdate.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMChildrenCountUpdate.java index 6d730129c5b..f7dc960261e 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMChildrenCountUpdate.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMChildrenCountUpdate.java @@ -14,7 +14,7 @@ package org.eclipse.cdt.dsf.ui.viewmodel; import org.eclipse.cdt.dsf.concurrent.DataRequestMonitor; - +import org.eclipse.cdt.dsf.debug.internal.ui.viewmodel.VMViewerUpdateTracing; import org.eclipse.cdt.dsf.internal.DsfPlugin; import org.eclipse.cdt.dsf.internal.LoggingUtils; import org.eclipse.cdt.dsf.internal.ui.DsfUIPlugin; @@ -23,7 +23,6 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta; import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext; import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate; import org.eclipse.jface.viewers.TreePath; -import org.eclipse.cdt.dsf.debug.internal.ui.viewmodel.VMViewerUpdateTracing; /** * Helper class implementation of the {@link IChildrenCountUpdate} update object. diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMViewerUpdate.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMViewerUpdate.java index 4c8b1994bb6..0a5165a02ec 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMViewerUpdate.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMViewerUpdate.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.dsf.ui.viewmodel; import java.util.LinkedList; import java.util.List; + import org.eclipse.cdt.dsf.concurrent.DsfExecutable; import org.eclipse.cdt.dsf.concurrent.RequestMonitor; import org.eclipse.cdt.dsf.internal.ui.DsfUIPlugin; diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelText.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelText.java index 7b48d36cc2f..e200b5b75d0 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelText.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelText.java @@ -13,7 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.dsf.ui.viewmodel.properties; -import com.ibm.icu.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.dsf.internal.ui.DsfUIPlugin; @@ -21,6 +20,8 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate; +import com.ibm.icu.text.MessageFormat; + /** * The text attribute of a label. It uses a message format string in order to * compose the text string. The parameter names determine the array of objects diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IInstructionWithSize.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IInstructionWithSize.java index e264ff39c67..b999f77a832 100644 --- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IInstructionWithSize.java +++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IInstructionWithSize.java @@ -14,8 +14,6 @@ *******************************************************************************/ package org.eclipse.cdt.dsf.debug.service; -import org.eclipse.cdt.dsf.debug.service.IInstruction; - /** * Extension interface for instructions knowing their size. * <p> diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDABackend.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDABackend.java index c3225d6f912..bb702a0d524 100644 --- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDABackend.java +++ b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDABackend.java @@ -21,15 +21,14 @@ import java.io.OutputStream; import java.net.ServerSocket; import java.net.Socket; import java.net.UnknownHostException; -import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.Hashtable; import java.util.List; import org.eclipse.cdt.dsf.concurrent.RequestMonitor; import org.eclipse.cdt.dsf.concurrent.Sequence; -import org.eclipse.cdt.dsf.concurrent.ThreadSafe; import org.eclipse.cdt.dsf.concurrent.Sequence.Step; +import org.eclipse.cdt.dsf.concurrent.ThreadSafe; import org.eclipse.cdt.dsf.service.AbstractDsfService; import org.eclipse.cdt.dsf.service.DsfSession; import org.eclipse.cdt.examples.dsf.pda.PDAPlugin; @@ -46,6 +45,8 @@ import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.Launch; import org.osgi.framework.BundleContext; +import com.ibm.icu.text.MessageFormat; + /** * Service that manages the backend process: starting the process * and monitoring for its shutdown. diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDARegisters.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDARegisters.java index cab72616782..be1dc5c3735 100644 --- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDARegisters.java +++ b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDARegisters.java @@ -24,9 +24,9 @@ import org.eclipse.cdt.dsf.datamodel.AbstractDMEvent; import org.eclipse.cdt.dsf.datamodel.DMContexts; import org.eclipse.cdt.dsf.datamodel.IDMContext; import org.eclipse.cdt.dsf.debug.service.ICachingService; +import org.eclipse.cdt.dsf.debug.service.IExpressions.IExpressionDMContext; import org.eclipse.cdt.dsf.debug.service.IRegisters; import org.eclipse.cdt.dsf.debug.service.IRunControl; -import org.eclipse.cdt.dsf.debug.service.IExpressions.IExpressionDMContext; import org.eclipse.cdt.dsf.debug.service.command.CommandCache; import org.eclipse.cdt.dsf.debug.service.command.IEventListener; import org.eclipse.cdt.dsf.service.AbstractDsfService; diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAStack.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAStack.java index 5eb191f113e..486c57b1ccd 100644 --- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAStack.java +++ b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAStack.java @@ -25,11 +25,11 @@ import org.eclipse.cdt.dsf.datamodel.DMContexts; import org.eclipse.cdt.dsf.datamodel.IDMContext; import org.eclipse.cdt.dsf.debug.service.ICachingService; import org.eclipse.cdt.dsf.debug.service.IRunControl; -import org.eclipse.cdt.dsf.debug.service.IStack; import org.eclipse.cdt.dsf.debug.service.IRunControl.IExecutionDMContext; import org.eclipse.cdt.dsf.debug.service.IRunControl.IResumedDMEvent; import org.eclipse.cdt.dsf.debug.service.IRunControl.ISuspendedDMEvent; import org.eclipse.cdt.dsf.debug.service.IRunControl.StateChangeReason; +import org.eclipse.cdt.dsf.debug.service.IStack; import org.eclipse.cdt.dsf.debug.service.command.CommandCache; import org.eclipse.cdt.dsf.service.AbstractDsfService; import org.eclipse.cdt.dsf.service.DsfServiceEventHandler; diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/DsfTestBreakpointAttributeTranslator2.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/DsfTestBreakpointAttributeTranslator2.java index a86405f6aa5..203a3892524 100644 --- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/DsfTestBreakpointAttributeTranslator2.java +++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/DsfTestBreakpointAttributeTranslator2.java @@ -20,9 +20,9 @@ import java.util.Map; import org.eclipse.cdt.dsf.concurrent.DataRequestMonitor; import org.eclipse.cdt.dsf.debug.service.BreakpointsMediator2; -import org.eclipse.cdt.dsf.debug.service.IBreakpointAttributeTranslator2; import org.eclipse.cdt.dsf.debug.service.BreakpointsMediator2.BreakpointEventType; import org.eclipse.cdt.dsf.debug.service.BreakpointsMediator2.ITargetBreakpointInfo; +import org.eclipse.cdt.dsf.debug.service.IBreakpointAttributeTranslator2; import org.eclipse.cdt.dsf.debug.service.IBreakpoints.IBreakpointsTargetDMContext; import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.model.IBreakpoint; diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfQueryTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfQueryTests.java index f9113c6ccd2..79ad3a95487 100644 --- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfQueryTests.java +++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfQueryTests.java @@ -13,7 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.tests.dsf.concurrent; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfSequenceProgressTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfSequenceProgressTests.java index 26da37b5d65..7440d22a609 100644 --- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfSequenceProgressTests.java +++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfSequenceProgressTests.java @@ -20,8 +20,6 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.ExecutionException; -import junit.framework.AssertionFailedError; - import org.eclipse.cdt.dsf.concurrent.DsfRunnable; import org.eclipse.cdt.dsf.concurrent.RequestMonitor; import org.eclipse.cdt.dsf.concurrent.Sequence; @@ -34,6 +32,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import junit.framework.AssertionFailedError; + /** * Test whether a step in a sequence can control the progress monitor. */ diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfSequenceTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfSequenceTests.java index af8633f2fde..2982253321c 100644 --- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfSequenceTests.java +++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfSequenceTests.java @@ -13,7 +13,9 @@ *******************************************************************************/ package org.eclipse.cdt.tests.dsf.concurrent; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/RmPerformanceTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/RmPerformanceTests.java index 055e71bdc12..a9cc7b24b62 100644 --- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/RmPerformanceTests.java +++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/RmPerformanceTests.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.tests.dsf.concurrent; -import junit.framework.TestCase; - import org.eclipse.cdt.dsf.concurrent.ImmediateExecutor; import org.eclipse.cdt.dsf.concurrent.RequestMonitor; import org.eclipse.test.performance.Performance; import org.eclipse.test.performance.PerformanceMeter; +import junit.framework.TestCase; + /** * Tests to measure the performance of the viewer updates. */ diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/TransactionTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/TransactionTests.java index d2fece4fdff..b6cc4739ac8 100644 --- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/TransactionTests.java +++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/TransactionTests.java @@ -13,16 +13,16 @@ *******************************************************************************/ package org.eclipse.cdt.tests.dsf.concurrent; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.util.Arrays; import java.util.concurrent.ExecutionException; -import org.eclipse.cdt.dsf.concurrent.RequestCache; import org.eclipse.cdt.dsf.concurrent.DataRequestMonitor; import org.eclipse.cdt.dsf.concurrent.DsfRunnable; import org.eclipse.cdt.dsf.concurrent.ImmediateInDsfExecutor; import org.eclipse.cdt.dsf.concurrent.Query; +import org.eclipse.cdt.dsf.concurrent.RequestCache; import org.eclipse.cdt.dsf.concurrent.Transaction; import org.eclipse.cdt.tests.dsf.TestDsfExecutor; import org.eclipse.core.runtime.CoreException; diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/FormattedValueTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/FormattedValueTests.java index 85858b17065..0edd588ff2a 100644 --- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/FormattedValueTests.java +++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/FormattedValueTests.java @@ -18,9 +18,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.concurrent.ExecutionException; -import junit.framework.AssertionFailedError; -import junit.framework.TestCase; - import org.eclipse.cdt.dsf.concurrent.DataRequestMonitor; import org.eclipse.cdt.dsf.concurrent.DefaultDsfExecutor; import org.eclipse.cdt.dsf.concurrent.DsfExecutor; @@ -56,6 +53,9 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.XMLMemento; +import junit.framework.AssertionFailedError; +import junit.framework.TestCase; + /** * Tests to verify the operation of FormattedValuesVMUtil * @since 2.2 diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/PerformanceTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/PerformanceTests.java index a3fb3887a51..5145e035778 100644 --- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/PerformanceTests.java +++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/PerformanceTests.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.tests.dsf.vm; -import junit.framework.TestCase; - import org.eclipse.cdt.dsf.concurrent.DefaultDsfExecutor; import org.eclipse.cdt.dsf.concurrent.DsfExecutor; import org.eclipse.cdt.dsf.service.DsfSession; @@ -32,6 +30,8 @@ import org.eclipse.test.performance.Performance; import org.eclipse.test.performance.PerformanceMeter; import org.eclipse.ui.PlatformUI; +import junit.framework.TestCase; + /** * Tests to measure the performance of the viewer updates. */ diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModel.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModel.java index 417e2014b0a..63f9fbf2b82 100644 --- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModel.java +++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModel.java @@ -13,6 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.tests.dsf.vm; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import java.util.Arrays; import java.util.Hashtable; @@ -34,9 +38,6 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationCont import org.eclipse.debug.internal.ui.viewers.model.provisional.ITreeModelViewer; import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta; import org.eclipse.jface.viewers.TreePath; - -import static org.junit.Assert.*; - import org.osgi.framework.BundleContext; /** diff --git a/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/launching/LLDBLaunch.java b/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/launching/LLDBLaunch.java index d56ec86d694..c0ea9a4f09e 100644 --- a/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/launching/LLDBLaunch.java +++ b/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/launching/LLDBLaunch.java @@ -27,8 +27,8 @@ import org.eclipse.cdt.dsf.gdb.launching.GdbLaunch; import org.eclipse.cdt.llvm.dsf.lldb.core.ILLDBDebugPreferenceConstants; import org.eclipse.cdt.llvm.dsf.lldb.core.ILLDBLaunchConfigurationConstants; import org.eclipse.cdt.llvm.dsf.lldb.core.internal.ILLDBConstants; -import org.eclipse.cdt.llvm.dsf.lldb.core.internal.LLDBTrait; import org.eclipse.cdt.llvm.dsf.lldb.core.internal.LLDBCorePlugin; +import org.eclipse.cdt.llvm.dsf.lldb.core.internal.LLDBTrait; import org.eclipse.cdt.utils.CommandLineUtil; import org.eclipse.cdt.utils.spawner.ProcessFactory; import org.eclipse.core.runtime.CoreException; diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPImplicitNameTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPImplicitNameTests.java index e077a6714d2..3419540959d 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPImplicitNameTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPImplicitNameTests.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.lrparser.tests; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.gnu.GCCLanguage; import org.eclipse.cdt.core.dom.lrparser.gnu.GPPLanguage; @@ -22,6 +20,8 @@ import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2CPPImplicitNameTests; +import junit.framework.TestSuite; + public class LRCPPImplicitNameTests extends AST2CPPImplicitNameTests { public static TestSuite suite() { diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPSpecTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPSpecTest.java index 764716f4b98..55cc8307e7b 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPSpecTest.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPSpecTest.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.lrparser.tests; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.gnu.GCCLanguage; import org.eclipse.cdt.core.dom.lrparser.gnu.GPPLanguage; @@ -23,6 +21,8 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2CPPSpecTest; import org.eclipse.cdt.internal.core.parser.ParserException; +import junit.framework.TestSuite; + @SuppressWarnings("restriction") public class LRCPPSpecTest extends AST2CPPSpecTest { diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCSpecTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCSpecTests.java index 6866836ad1a..72b7051b773 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCSpecTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCSpecTests.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.lrparser.tests; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.gnu.GCCLanguage; import org.eclipse.cdt.core.dom.lrparser.gnu.GPPLanguage; @@ -23,6 +21,8 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2CSpecTest; import org.eclipse.cdt.internal.core.parser.ParserException; +import junit.framework.TestSuite; + @SuppressWarnings({ "restriction", "nls" }) public class LRCSpecTests extends AST2CSpecTest { diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCommentTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCommentTests.java index 08b9f1c51fa..c630db78383 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCommentTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCommentTests.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.lrparser.tests; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTComment; import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; @@ -25,6 +23,8 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.CommentTests; import org.eclipse.cdt.internal.core.parser.ParserException; +import junit.framework.TestSuite; + @SuppressWarnings("restriction") public class LRCommentTests extends CommentTests { diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompleteParser2Tests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompleteParser2Tests.java index a532402c80f..fed07103fda 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompleteParser2Tests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompleteParser2Tests.java @@ -13,9 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.lrparser.tests; -import junit.framework.AssertionFailedError; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.gnu.GCCLanguage; import org.eclipse.cdt.core.dom.lrparser.gnu.GPPLanguage; @@ -23,6 +20,9 @@ import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.CompleteParser2Tests; +import junit.framework.AssertionFailedError; +import junit.framework.TestSuite; + public class LRCompleteParser2Tests extends CompleteParser2Tests { public static TestSuite suite() { diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompletionBasicTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompletionBasicTest.java index aa088b84eb9..c1d6bb988c2 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompletionBasicTest.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompletionBasicTest.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.lrparser.tests; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IFunction; @@ -26,6 +24,8 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.prefix.BasicCompletionTest; import org.eclipse.cdt.internal.core.parser.ParserException; +import junit.framework.TestSuite; + @SuppressWarnings({ "restriction", "nls" }) public class LRCompletionBasicTest extends BasicCompletionTest { diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationMacroTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationMacroTests.java index 12baf426be5..5e410e8f3f2 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationMacroTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationMacroTests.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.lrparser.tests; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.gnu.GCCLanguage; import org.eclipse.cdt.core.dom.lrparser.gnu.GPPLanguage; @@ -23,6 +21,8 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.DOMLocationMacroTests; import org.eclipse.cdt.internal.core.parser.ParserException; +import junit.framework.TestSuite; + @SuppressWarnings("restriction") public class LRDOMLocationMacroTests extends DOMLocationMacroTests { diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationTests.java index c6cd2a1c97e..6cf11abcbf8 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationTests.java @@ -13,9 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.lrparser.tests; -import junit.framework.AssertionFailedError; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.gnu.GCCLanguage; import org.eclipse.cdt.core.dom.lrparser.gnu.GPPLanguage; @@ -24,6 +21,9 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.DOMLocationTests; import org.eclipse.cdt.internal.core.parser.ParserException; +import junit.framework.AssertionFailedError; +import junit.framework.TestSuite; + @SuppressWarnings("restriction") public class LRDOMLocationTests extends DOMLocationTests { diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMPreprocessorInformationTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMPreprocessorInformationTest.java index 70479424f0f..29bf24ef98f 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMPreprocessorInformationTest.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMPreprocessorInformationTest.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.lrparser.tests; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.gnu.GCCLanguage; import org.eclipse.cdt.core.dom.lrparser.gnu.GPPLanguage; @@ -23,6 +21,8 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.DOMPreprocessorInformationTest; import org.eclipse.cdt.internal.core.parser.ParserException; +import junit.framework.TestSuite; + @SuppressWarnings("restriction") public class LRDOMPreprocessorInformationTest extends DOMPreprocessorInformationTest { diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRGCCCompleteParseExtensionsTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRGCCCompleteParseExtensionsTest.java index cb13ee933aa..d92c5cdbbd1 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRGCCCompleteParseExtensionsTest.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRGCCCompleteParseExtensionsTest.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.lrparser.tests; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.gnu.GCCLanguage; import org.eclipse.cdt.core.dom.lrparser.gnu.GPPLanguage; @@ -23,6 +21,8 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.GCCCompleteParseExtensionsTest; import org.eclipse.cdt.internal.core.parser.ParserException; +import junit.framework.TestSuite; + @SuppressWarnings("restriction") public class LRGCCCompleteParseExtensionsTest extends GCCCompleteParseExtensionsTest { diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRGCCTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRGCCTests.java index 17d0191db73..d6dc8bd452a 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRGCCTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRGCCTests.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.lrparser.tests; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.gnu.GCCLanguage; import org.eclipse.cdt.core.dom.lrparser.gnu.GPPLanguage; @@ -23,6 +21,8 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.GCCTests; import org.eclipse.cdt.internal.core.parser.ParserException; +import junit.framework.TestSuite; + @SuppressWarnings("restriction") public class LRGCCTests extends GCCTests { diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRImageLocationTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRImageLocationTests.java index 4db9e2cadd2..f3403fc94a8 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRImageLocationTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRImageLocationTests.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.lrparser.tests; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.gnu.GCCLanguage; import org.eclipse.cdt.core.dom.lrparser.gnu.GPPLanguage; @@ -23,6 +21,8 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.ImageLocationTests; import org.eclipse.cdt.internal.core.parser.ParserException; +import junit.framework.TestSuite; + @SuppressWarnings("restriction") public class LRImageLocationTests extends ImageLocationTests { diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRInactiveCodeTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRInactiveCodeTests.java index fb01e04ae34..6c1e3fe338d 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRInactiveCodeTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRInactiveCodeTests.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.lrparser.tests; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.gnu.GCCLanguage; import org.eclipse.cdt.core.dom.lrparser.gnu.GPPLanguage; @@ -22,6 +20,8 @@ import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.ASTInactiveCodeTests; +import junit.framework.TestSuite; + public class LRInactiveCodeTests extends ASTInactiveCodeTests { public static TestSuite suite() { diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRKnRTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRKnRTests.java index 82c993e9b86..bcbf84819cf 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRKnRTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRKnRTests.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.lrparser.tests; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.gnu.GCCLanguage; import org.eclipse.cdt.core.dom.lrparser.gnu.GPPLanguage; @@ -23,6 +21,8 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2KnRTests; import org.eclipse.cdt.internal.core.parser.ParserException; +import junit.framework.TestSuite; + /** * @author Mike Kucera */ diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRNodeSelectorTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRNodeSelectorTest.java index 3beb172c7cb..c4765a56528 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRNodeSelectorTest.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRNodeSelectorTest.java @@ -15,8 +15,6 @@ package org.eclipse.cdt.core.lrparser.tests; import java.io.IOException; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.gnu.GCCLanguage; import org.eclipse.cdt.core.dom.lrparser.gnu.GPPLanguage; @@ -25,6 +23,8 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.ASTNodeSelectorTest; import org.eclipse.cdt.internal.core.parser.ParserException; +import junit.framework.TestSuite; + @SuppressWarnings("restriction") public class LRNodeSelectorTest extends ASTNodeSelectorTest { diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRSelectionParseTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRSelectionParseTest.java index 968072dbdb8..b2b49980cd0 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRSelectionParseTest.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRSelectionParseTest.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.lrparser.tests; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ICodeReaderFactory; import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; @@ -30,6 +28,8 @@ import org.eclipse.cdt.internal.core.dom.SavedCodeReaderFactory; import org.eclipse.cdt.internal.core.parser.ParserException; import org.eclipse.core.resources.IFile; +import junit.framework.TestSuite; + @SuppressWarnings("restriction") public class LRSelectionParseTest extends AST2SelectionParseTest { diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRSemanticsTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRSemanticsTests.java index e3c4f1988d9..24d0c715304 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRSemanticsTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRSemanticsTests.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.lrparser.tests; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.gnu.GCCLanguage; import org.eclipse.cdt.core.dom.lrparser.gnu.GPPLanguage; @@ -23,6 +21,8 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.SemanticsTests; import org.eclipse.cdt.internal.core.parser.ParserException; +import junit.framework.TestSuite; + @SuppressWarnings("restriction") public class LRSemanticsTests extends SemanticsTests { diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTaskParserTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTaskParserTest.java index c39dd414d2a..eff62df073a 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTaskParserTest.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTaskParserTest.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.lrparser.tests; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.gnu.GCCLanguage; import org.eclipse.cdt.core.dom.lrparser.gnu.GPPLanguage; @@ -23,6 +21,8 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.TaskParserTest; import org.eclipse.cdt.internal.core.parser.ParserException; +import junit.framework.TestSuite; + @SuppressWarnings("restriction") public class LRTaskParserTest extends TaskParserTest { diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTemplateTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTemplateTests.java index 0101827f051..3a4bdb7ae8e 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTemplateTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTemplateTests.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.lrparser.tests; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.gnu.GCCLanguage; import org.eclipse.cdt.core.dom.lrparser.gnu.GPPLanguage; @@ -23,6 +21,8 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2TemplateTests; import org.eclipse.cdt.internal.core.parser.ParserException; +import junit.framework.TestSuite; + @SuppressWarnings("restriction") public class LRTemplateTests extends AST2TemplateTests { diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTests.java index adf1affcaea..2b0bbac05d7 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTests.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.lrparser.tests; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTDeclaration; import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; @@ -26,6 +24,8 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2Tests; import org.eclipse.cdt.internal.core.parser.ParserException; +import junit.framework.TestSuite; + /** * * @author Mike Kucera diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilOldTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilOldTests.java index ead99ae5ea9..9b15b9092f8 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilOldTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilOldTests.java @@ -13,9 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.lrparser.tests; -import junit.framework.AssertionFailedError; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.gnu.GCCLanguage; import org.eclipse.cdt.core.dom.lrparser.gnu.GPPLanguage; @@ -24,6 +21,9 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2UtilOldTests; import org.eclipse.cdt.internal.core.parser.ParserException; +import junit.framework.AssertionFailedError; +import junit.framework.TestSuite; + @SuppressWarnings("restriction") public class LRUtilOldTests extends AST2UtilOldTests { diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilTests.java index d4a53f51b97..f94e7816171 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilTests.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.lrparser.tests; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.gnu.GCCLanguage; import org.eclipse.cdt.core.dom.lrparser.gnu.GPPLanguage; @@ -23,6 +21,8 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2UtilTests; import org.eclipse.cdt.internal.core.parser.ParserException; +import junit.framework.TestSuite; + @SuppressWarnings("restriction") public class LRUtilTests extends AST2UtilTests { diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/ParseHelper.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/ParseHelper.java index 016cfcc5c81..d75cc556899 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/ParseHelper.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/ParseHelper.java @@ -16,8 +16,6 @@ package org.eclipse.cdt.core.lrparser.tests; import java.util.ArrayList; import java.util.List; -import junit.framework.AssertionFailedError; - import org.eclipse.cdt.core.dom.ICodeReaderFactory; import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; @@ -37,6 +35,8 @@ import org.eclipse.cdt.internal.core.dom.parser.c.CVisitor; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTNameBase; import org.eclipse.core.runtime.CoreException; +import junit.framework.AssertionFailedError; + /** * Utility methods for parsing test code using the C99 LPG parser. * diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/C99ResolveParserAction.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/C99ResolveParserAction.java index 89d6feb266f..abd52f2f27a 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/C99ResolveParserAction.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/C99ResolveParserAction.java @@ -21,8 +21,6 @@ import static org.eclipse.cdt.internal.core.dom.lrparser.symboltable.CNamespace. import java.util.LinkedList; import java.util.List; -import lpg.lpgjavaruntime.IToken; - import org.eclipse.cdt.core.dom.ast.EScopeKind; import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier; @@ -63,6 +61,8 @@ import org.eclipse.cdt.internal.core.dom.lrparser.c99.bindings.ITypeable; import org.eclipse.cdt.internal.core.dom.lrparser.symboltable.C99SymbolTable; import org.eclipse.cdt.internal.core.dom.parser.ITypeContainer; +import lpg.lpgjavaruntime.IToken; + /** * This class was an attempt at doing full binding resolution during the parse * as opposed to doing it after the parse as is normally done with the DOM parser. diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/C99TypedefTrackerParserAction.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/C99TypedefTrackerParserAction.java index d8161398fb8..3a282c4ac6f 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/C99TypedefTrackerParserAction.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/C99TypedefTrackerParserAction.java @@ -15,12 +15,12 @@ package org.eclipse.cdt.internal.core.dom.lrparser.c99.action.deprecated; import java.util.LinkedList; -import lpg.lpgjavaruntime.IToken; - import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; import org.eclipse.cdt.core.parser.util.DebugUtil; import org.eclipse.cdt.internal.core.dom.lrparser.symboltable.TypedefSymbolTable; +import lpg.lpgjavaruntime.IToken; + /** * A simple set of trial and undo actions that just keep track * of typedef names. This information is then fed back to the parser diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/DeclSpec.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/DeclSpec.java index 2c9b4554442..7139946aad1 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/DeclSpec.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/DeclSpec.java @@ -13,7 +13,26 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.lrparser.c99.action.deprecated; -import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.*; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK__Bool; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK__Complex; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK__Imaginary; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_auto; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_char; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_const; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_double; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_extern; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_float; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_inline; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_int; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_long; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_register; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_restrict; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_short; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_signed; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_static; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_unsigned; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_void; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_volatile; import java.util.HashMap; import java.util.Map; diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/DeclaratorFrame.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/DeclaratorFrame.java index 6ea2e5b70d7..eafe559a0c6 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/DeclaratorFrame.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/DeclaratorFrame.java @@ -16,13 +16,13 @@ package org.eclipse.cdt.internal.core.dom.lrparser.c99.action.deprecated; import java.util.LinkedList; import java.util.List; -import lpg.lpgjavaruntime.IToken; - import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IType; import org.eclipse.cdt.internal.core.dom.lrparser.c99.bindings.C99PointerType; import org.eclipse.cdt.internal.core.dom.parser.ITypeContainer; +import lpg.lpgjavaruntime.IToken; + /** * Represents a frame on the declaration stack used by the resolver actions. * diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99PointerType.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99PointerType.java index c9f3c604c3d..20c8aebcb89 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99PointerType.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99PointerType.java @@ -13,7 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.lrparser.c99.bindings; -import org.eclipse.cdt.core.dom.ast.DOMException; import org.eclipse.cdt.core.dom.ast.IType; import org.eclipse.cdt.core.dom.ast.c.ICPointerType; import org.eclipse.cdt.internal.core.dom.parser.ITypeContainer; diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99QualifierType.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99QualifierType.java index 3ff031e9b5b..ff5d67ef4dc 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99QualifierType.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99QualifierType.java @@ -13,7 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.lrparser.c99.bindings; -import org.eclipse.cdt.core.dom.ast.DOMException; import org.eclipse.cdt.core.dom.ast.IType; import org.eclipse.cdt.core.dom.ast.c.ICQualifierType; import org.eclipse.cdt.internal.core.dom.parser.ITypeContainer; diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/CPreprocessorAdapter.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/CPreprocessorAdapter.java index bc126d97190..ca82d49cfa3 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/CPreprocessorAdapter.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/CPreprocessorAdapter.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.dom.lrparser; -import lpg.lpgjavaruntime.IToken; -import lpg.lpgjavaruntime.Token; - import org.eclipse.cdt.core.parser.EndOfFileException; import org.eclipse.cdt.core.parser.IScanner; import org.eclipse.cdt.core.parser.OffsetLimitReachedException; +import lpg.lpgjavaruntime.IToken; +import lpg.lpgjavaruntime.Token; + /** * Adapts the CPreprocessor from the CDT core for use with LPG based parsers. * diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/ISecondaryParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/ISecondaryParser.java index 6ef6f0bfe0d..584c4ee8ee9 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/ISecondaryParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/ISecondaryParser.java @@ -15,10 +15,10 @@ package org.eclipse.cdt.core.dom.lrparser; import java.util.List; -import lpg.lpgjavaruntime.IToken; - import org.eclipse.cdt.core.dom.ast.IASTNode; +import lpg.lpgjavaruntime.IToken; + public interface ISecondaryParser<N extends IASTNode> extends IParser<N> { /** diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/AbstractParserAction.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/AbstractParserAction.java index 87617550e74..456ad6a8d03 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/AbstractParserAction.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/AbstractParserAction.java @@ -17,14 +17,14 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import lpg.lpgjavaruntime.IToken; - import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; import org.eclipse.cdt.internal.core.dom.parser.ASTNode; +import lpg.lpgjavaruntime.IToken; + @SuppressWarnings("restriction") public abstract class AbstractParserAction { diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/ParserUtil.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/ParserUtil.java index 091d0e57a2e..8c347d47c56 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/ParserUtil.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/ParserUtil.java @@ -16,12 +16,12 @@ package org.eclipse.cdt.core.dom.lrparser.action; import java.util.Arrays; import java.util.List; -import lpg.lpgjavaruntime.IToken; - import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.internal.core.dom.parser.ASTNode; +import lpg.lpgjavaruntime.IToken; + @SuppressWarnings("restriction") public final class ParserUtil { diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/c99/C99BuildASTParserAction.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/c99/C99BuildASTParserAction.java index 46034b94d4b..d4862fa2d5f 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/c99/C99BuildASTParserAction.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/c99/C99BuildASTParserAction.java @@ -14,14 +14,42 @@ package org.eclipse.cdt.core.dom.lrparser.action.c99; -import static org.eclipse.cdt.core.dom.lrparser.action.ParserUtil.*; -import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.*; +import static org.eclipse.cdt.core.dom.lrparser.action.ParserUtil.endOffset; +import static org.eclipse.cdt.core.dom.lrparser.action.ParserUtil.length; +import static org.eclipse.cdt.core.dom.lrparser.action.ParserUtil.matchTokens; +import static org.eclipse.cdt.core.dom.lrparser.action.ParserUtil.offset; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Completion; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_EndOfCompletion; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_LeftParen; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_SemiColon; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK__Bool; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK__Complex; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_auto; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_char; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_const; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_double; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_extern; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_float; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_for; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_identifier; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_inline; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_int; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_long; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_register; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_restrict; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_short; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_signed; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_static; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_struct; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_typedef; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_union; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_unsigned; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_void; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_volatile; import java.util.Collections; import java.util.List; -import lpg.lpgjavaruntime.IToken; - import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement; import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier; @@ -79,6 +107,8 @@ import org.eclipse.cdt.internal.core.dom.parser.IASTAmbiguousStatement; import org.eclipse.cdt.internal.core.dom.parser.c.CASTAmbiguousExpression; import org.eclipse.cdt.internal.core.dom.parser.c.CASTAmbiguousStatement; +import lpg.lpgjavaruntime.IToken; + /** * Semantic actions called by the C99 parser to build an AST. * diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/cpp/CPPBuildASTParserAction.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/cpp/CPPBuildASTParserAction.java index 6b5f482d5dc..4a97e4c916b 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/cpp/CPPBuildASTParserAction.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/cpp/CPPBuildASTParserAction.java @@ -13,10 +13,55 @@ *******************************************************************************/ package org.eclipse.cdt.core.dom.lrparser.action.cpp; -import static org.eclipse.cdt.core.dom.lrparser.action.ParserUtil.*; +import static org.eclipse.cdt.core.dom.lrparser.action.ParserUtil.endOffset; +import static org.eclipse.cdt.core.dom.lrparser.action.ParserUtil.length; +import static org.eclipse.cdt.core.dom.lrparser.action.ParserUtil.matchTokens; +import static org.eclipse.cdt.core.dom.lrparser.action.ParserUtil.offset; import static org.eclipse.cdt.core.parser.util.CollectionUtils.findFirstAndRemove; import static org.eclipse.cdt.core.parser.util.CollectionUtils.reverseIterable; -import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.*; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_ColonColon; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Completion; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_EndOfCompletion; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_LeftBracket; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_LeftParen; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_RightBracket; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_RightParen; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_SemiColon; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_auto; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_bool; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_char; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_class; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_const; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_delete; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_double; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_enum; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_explicit; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_extern; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_float; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_for; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_friend; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_identifier; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_inline; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_int; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_long; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_mutable; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_new; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_private; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_protected; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_public; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_register; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_short; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_signed; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_static; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_struct; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_typedef; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_typename; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_union; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_unsigned; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_virtual; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_void; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_volatile; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_wchar_t; import java.util.ArrayList; import java.util.Arrays; @@ -24,8 +69,6 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; -import lpg.lpgjavaruntime.IToken; - import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement; import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier; @@ -118,6 +161,8 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTAmbiguousTemplateArgum import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTConstructorInitializer; import org.eclipse.cdt.internal.core.dom.parser.cpp.OverloadableOperator; +import lpg.lpgjavaruntime.IToken; + /** * Semantic actions that build the AST during the parse. * These are the actions that are specific to the C++ parser, the superclass diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/gnu/GPPBuildASTParserAction.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/gnu/GPPBuildASTParserAction.java index a9f6963bfdc..8d426ae8381 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/gnu/GPPBuildASTParserAction.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/gnu/GPPBuildASTParserAction.java @@ -17,8 +17,6 @@ import static org.eclipse.cdt.core.parser.util.CollectionUtils.findFirstAndRemov import java.util.List; -import lpg.lpgjavaruntime.IToken; - import org.eclipse.cdt.core.dom.ast.IASTDeclaration; import org.eclipse.cdt.core.dom.ast.IASTExpression; import org.eclipse.cdt.core.dom.ast.IASTInitializerList; @@ -38,6 +36,8 @@ import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction; import org.eclipse.cdt.core.dom.lrparser.action.cpp.ICPPSecondaryParserFactory; import org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym; +import lpg.lpgjavaruntime.IToken; + public class GPPBuildASTParserAction extends CPPBuildASTParserAction { private final ICPPNodeFactory nodeFactory; diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/c99/DOMToC99TokenMap.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/c99/DOMToC99TokenMap.java index 2bd909aca3f..b49ed623cf2 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/c99/DOMToC99TokenMap.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/c99/DOMToC99TokenMap.java @@ -13,8 +13,196 @@ *******************************************************************************/ package org.eclipse.cdt.core.dom.lrparser.c99; -import static org.eclipse.cdt.core.parser.IToken.*; -import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.*; +import static org.eclipse.cdt.core.parser.IToken.tAMPER; +import static org.eclipse.cdt.core.parser.IToken.tAMPERASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tAND; +import static org.eclipse.cdt.core.parser.IToken.tARROW; +import static org.eclipse.cdt.core.parser.IToken.tASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tBITCOMPLEMENT; +import static org.eclipse.cdt.core.parser.IToken.tBITOR; +import static org.eclipse.cdt.core.parser.IToken.tBITORASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tCHAR; +import static org.eclipse.cdt.core.parser.IToken.tCOLON; +import static org.eclipse.cdt.core.parser.IToken.tCOMMA; +import static org.eclipse.cdt.core.parser.IToken.tCOMPLETION; +import static org.eclipse.cdt.core.parser.IToken.tDECR; +import static org.eclipse.cdt.core.parser.IToken.tDIV; +import static org.eclipse.cdt.core.parser.IToken.tDIVASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tDOT; +import static org.eclipse.cdt.core.parser.IToken.tELLIPSIS; +import static org.eclipse.cdt.core.parser.IToken.tEND_OF_INPUT; +import static org.eclipse.cdt.core.parser.IToken.tEOC; +import static org.eclipse.cdt.core.parser.IToken.tEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tFLOATINGPT; +import static org.eclipse.cdt.core.parser.IToken.tGT; +import static org.eclipse.cdt.core.parser.IToken.tGTEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tIDENTIFIER; +import static org.eclipse.cdt.core.parser.IToken.tINCR; +import static org.eclipse.cdt.core.parser.IToken.tINTEGER; +import static org.eclipse.cdt.core.parser.IToken.tLBRACE; +import static org.eclipse.cdt.core.parser.IToken.tLBRACKET; +import static org.eclipse.cdt.core.parser.IToken.tLCHAR; +import static org.eclipse.cdt.core.parser.IToken.tLPAREN; +import static org.eclipse.cdt.core.parser.IToken.tLSTRING; +import static org.eclipse.cdt.core.parser.IToken.tLT; +import static org.eclipse.cdt.core.parser.IToken.tLTEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tMINUS; +import static org.eclipse.cdt.core.parser.IToken.tMINUSASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tMOD; +import static org.eclipse.cdt.core.parser.IToken.tMODASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tNOT; +import static org.eclipse.cdt.core.parser.IToken.tNOTEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tOR; +import static org.eclipse.cdt.core.parser.IToken.tPLUS; +import static org.eclipse.cdt.core.parser.IToken.tPLUSASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tQUESTION; +import static org.eclipse.cdt.core.parser.IToken.tRBRACE; +import static org.eclipse.cdt.core.parser.IToken.tRBRACKET; +import static org.eclipse.cdt.core.parser.IToken.tRPAREN; +import static org.eclipse.cdt.core.parser.IToken.tSEMI; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTL; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTLASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTR; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTRASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tSTAR; +import static org.eclipse.cdt.core.parser.IToken.tSTARASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tSTRING; +import static org.eclipse.cdt.core.parser.IToken.tUNKNOWN_CHAR; +import static org.eclipse.cdt.core.parser.IToken.tUTF16CHAR; +import static org.eclipse.cdt.core.parser.IToken.tUTF16STRING; +import static org.eclipse.cdt.core.parser.IToken.tUTF32CHAR; +import static org.eclipse.cdt.core.parser.IToken.tUTF32STRING; +import static org.eclipse.cdt.core.parser.IToken.tXOR; +import static org.eclipse.cdt.core.parser.IToken.tXORASSIGN; +import static org.eclipse.cdt.core.parser.IToken.t__Bool; +import static org.eclipse.cdt.core.parser.IToken.t__Complex; +import static org.eclipse.cdt.core.parser.IToken.t__Imaginary; +import static org.eclipse.cdt.core.parser.IToken.t_auto; +import static org.eclipse.cdt.core.parser.IToken.t_break; +import static org.eclipse.cdt.core.parser.IToken.t_case; +import static org.eclipse.cdt.core.parser.IToken.t_char; +import static org.eclipse.cdt.core.parser.IToken.t_const; +import static org.eclipse.cdt.core.parser.IToken.t_continue; +import static org.eclipse.cdt.core.parser.IToken.t_default; +import static org.eclipse.cdt.core.parser.IToken.t_do; +import static org.eclipse.cdt.core.parser.IToken.t_double; +import static org.eclipse.cdt.core.parser.IToken.t_else; +import static org.eclipse.cdt.core.parser.IToken.t_enum; +import static org.eclipse.cdt.core.parser.IToken.t_extern; +import static org.eclipse.cdt.core.parser.IToken.t_float; +import static org.eclipse.cdt.core.parser.IToken.t_for; +import static org.eclipse.cdt.core.parser.IToken.t_goto; +import static org.eclipse.cdt.core.parser.IToken.t_if; +import static org.eclipse.cdt.core.parser.IToken.t_inline; +import static org.eclipse.cdt.core.parser.IToken.t_int; +import static org.eclipse.cdt.core.parser.IToken.t_long; +import static org.eclipse.cdt.core.parser.IToken.t_register; +import static org.eclipse.cdt.core.parser.IToken.t_restrict; +import static org.eclipse.cdt.core.parser.IToken.t_return; +import static org.eclipse.cdt.core.parser.IToken.t_short; +import static org.eclipse.cdt.core.parser.IToken.t_signed; +import static org.eclipse.cdt.core.parser.IToken.t_sizeof; +import static org.eclipse.cdt.core.parser.IToken.t_static; +import static org.eclipse.cdt.core.parser.IToken.t_struct; +import static org.eclipse.cdt.core.parser.IToken.t_switch; +import static org.eclipse.cdt.core.parser.IToken.t_typedef; +import static org.eclipse.cdt.core.parser.IToken.t_union; +import static org.eclipse.cdt.core.parser.IToken.t_unsigned; +import static org.eclipse.cdt.core.parser.IToken.t_void; +import static org.eclipse.cdt.core.parser.IToken.t_volatile; +import static org.eclipse.cdt.core.parser.IToken.t_while; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_And; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_AndAnd; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_AndAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Arrow; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Assign; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Bang; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Caret; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_CaretAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Colon; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Comma; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Completion; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Dot; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_DotDotDot; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_EOF_TOKEN; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_EQ; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_EndOfCompletion; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_GE; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_GT; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Invalid; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_LE; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_LT; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_LeftBrace; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_LeftBracket; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_LeftParen; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_LeftShift; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_LeftShiftAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Minus; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_MinusAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_MinusMinus; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_NE; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Or; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_OrAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_OrOr; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Percent; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_PercentAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Plus; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_PlusAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_PlusPlus; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Question; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_RightBrace; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_RightBracket; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_RightParen; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_RightShift; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_RightShiftAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_SemiColon; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Slash; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_SlashAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Star; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_StarAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_Tilde; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK__Bool; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK__Complex; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK__Imaginary; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_auto; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_break; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_case; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_char; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_charconst; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_const; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_continue; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_default; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_do; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_double; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_else; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_enum; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_extern; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_float; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_floating; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_for; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_goto; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_identifier; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_if; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_inline; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_int; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_integer; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_long; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_register; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_restrict; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_return; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_short; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_signed; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_sizeof; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_static; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_stringlit; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_struct; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_switch; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_typedef; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_union; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_unsigned; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_void; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_volatile; +import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.TK_while; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.parser.IToken; diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/cpp/DOMToISOCPPTokenMap.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/cpp/DOMToISOCPPTokenMap.java index d5ab01d7669..fe465f6821a 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/cpp/DOMToISOCPPTokenMap.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/cpp/DOMToISOCPPTokenMap.java @@ -13,8 +13,255 @@ *******************************************************************************/ package org.eclipse.cdt.core.dom.lrparser.cpp; -import static org.eclipse.cdt.core.parser.IToken.*; -import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.*; +import static org.eclipse.cdt.core.parser.IToken.tAMPER; +import static org.eclipse.cdt.core.parser.IToken.tAMPERASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tAND; +import static org.eclipse.cdt.core.parser.IToken.tARROW; +import static org.eclipse.cdt.core.parser.IToken.tARROWSTAR; +import static org.eclipse.cdt.core.parser.IToken.tASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tBITCOMPLEMENT; +import static org.eclipse.cdt.core.parser.IToken.tBITOR; +import static org.eclipse.cdt.core.parser.IToken.tBITORASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tCHAR; +import static org.eclipse.cdt.core.parser.IToken.tCOLON; +import static org.eclipse.cdt.core.parser.IToken.tCOLONCOLON; +import static org.eclipse.cdt.core.parser.IToken.tCOMMA; +import static org.eclipse.cdt.core.parser.IToken.tCOMPLETION; +import static org.eclipse.cdt.core.parser.IToken.tDECR; +import static org.eclipse.cdt.core.parser.IToken.tDIV; +import static org.eclipse.cdt.core.parser.IToken.tDIVASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tDOT; +import static org.eclipse.cdt.core.parser.IToken.tDOTSTAR; +import static org.eclipse.cdt.core.parser.IToken.tELLIPSIS; +import static org.eclipse.cdt.core.parser.IToken.tEND_OF_INPUT; +import static org.eclipse.cdt.core.parser.IToken.tEOC; +import static org.eclipse.cdt.core.parser.IToken.tEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tFLOATINGPT; +import static org.eclipse.cdt.core.parser.IToken.tGT; +import static org.eclipse.cdt.core.parser.IToken.tGTEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tIDENTIFIER; +import static org.eclipse.cdt.core.parser.IToken.tINCR; +import static org.eclipse.cdt.core.parser.IToken.tINTEGER; +import static org.eclipse.cdt.core.parser.IToken.tLBRACE; +import static org.eclipse.cdt.core.parser.IToken.tLBRACKET; +import static org.eclipse.cdt.core.parser.IToken.tLCHAR; +import static org.eclipse.cdt.core.parser.IToken.tLPAREN; +import static org.eclipse.cdt.core.parser.IToken.tLSTRING; +import static org.eclipse.cdt.core.parser.IToken.tLT; +import static org.eclipse.cdt.core.parser.IToken.tLTEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tMINUS; +import static org.eclipse.cdt.core.parser.IToken.tMINUSASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tMOD; +import static org.eclipse.cdt.core.parser.IToken.tMODASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tNOT; +import static org.eclipse.cdt.core.parser.IToken.tNOTEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tOR; +import static org.eclipse.cdt.core.parser.IToken.tPLUS; +import static org.eclipse.cdt.core.parser.IToken.tPLUSASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tPOUND; +import static org.eclipse.cdt.core.parser.IToken.tQUESTION; +import static org.eclipse.cdt.core.parser.IToken.tRBRACE; +import static org.eclipse.cdt.core.parser.IToken.tRBRACKET; +import static org.eclipse.cdt.core.parser.IToken.tRPAREN; +import static org.eclipse.cdt.core.parser.IToken.tSEMI; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTL; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTLASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTR; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTRASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tSTAR; +import static org.eclipse.cdt.core.parser.IToken.tSTARASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tSTRING; +import static org.eclipse.cdt.core.parser.IToken.tUNKNOWN_CHAR; +import static org.eclipse.cdt.core.parser.IToken.tUTF16CHAR; +import static org.eclipse.cdt.core.parser.IToken.tUTF16STRING; +import static org.eclipse.cdt.core.parser.IToken.tUTF32CHAR; +import static org.eclipse.cdt.core.parser.IToken.tUTF32STRING; +import static org.eclipse.cdt.core.parser.IToken.tXOR; +import static org.eclipse.cdt.core.parser.IToken.tXORASSIGN; +import static org.eclipse.cdt.core.parser.IToken.t_asm; +import static org.eclipse.cdt.core.parser.IToken.t_auto; +import static org.eclipse.cdt.core.parser.IToken.t_bool; +import static org.eclipse.cdt.core.parser.IToken.t_break; +import static org.eclipse.cdt.core.parser.IToken.t_case; +import static org.eclipse.cdt.core.parser.IToken.t_catch; +import static org.eclipse.cdt.core.parser.IToken.t_char; +import static org.eclipse.cdt.core.parser.IToken.t_class; +import static org.eclipse.cdt.core.parser.IToken.t_const; +import static org.eclipse.cdt.core.parser.IToken.t_const_cast; +import static org.eclipse.cdt.core.parser.IToken.t_continue; +import static org.eclipse.cdt.core.parser.IToken.t_default; +import static org.eclipse.cdt.core.parser.IToken.t_delete; +import static org.eclipse.cdt.core.parser.IToken.t_do; +import static org.eclipse.cdt.core.parser.IToken.t_double; +import static org.eclipse.cdt.core.parser.IToken.t_dynamic_cast; +import static org.eclipse.cdt.core.parser.IToken.t_else; +import static org.eclipse.cdt.core.parser.IToken.t_enum; +import static org.eclipse.cdt.core.parser.IToken.t_explicit; +import static org.eclipse.cdt.core.parser.IToken.t_export; +import static org.eclipse.cdt.core.parser.IToken.t_extern; +import static org.eclipse.cdt.core.parser.IToken.t_false; +import static org.eclipse.cdt.core.parser.IToken.t_float; +import static org.eclipse.cdt.core.parser.IToken.t_for; +import static org.eclipse.cdt.core.parser.IToken.t_friend; +import static org.eclipse.cdt.core.parser.IToken.t_goto; +import static org.eclipse.cdt.core.parser.IToken.t_if; +import static org.eclipse.cdt.core.parser.IToken.t_inline; +import static org.eclipse.cdt.core.parser.IToken.t_int; +import static org.eclipse.cdt.core.parser.IToken.t_long; +import static org.eclipse.cdt.core.parser.IToken.t_mutable; +import static org.eclipse.cdt.core.parser.IToken.t_namespace; +import static org.eclipse.cdt.core.parser.IToken.t_new; +import static org.eclipse.cdt.core.parser.IToken.t_operator; +import static org.eclipse.cdt.core.parser.IToken.t_private; +import static org.eclipse.cdt.core.parser.IToken.t_protected; +import static org.eclipse.cdt.core.parser.IToken.t_public; +import static org.eclipse.cdt.core.parser.IToken.t_register; +import static org.eclipse.cdt.core.parser.IToken.t_reinterpret_cast; +import static org.eclipse.cdt.core.parser.IToken.t_return; +import static org.eclipse.cdt.core.parser.IToken.t_short; +import static org.eclipse.cdt.core.parser.IToken.t_signed; +import static org.eclipse.cdt.core.parser.IToken.t_sizeof; +import static org.eclipse.cdt.core.parser.IToken.t_static; +import static org.eclipse.cdt.core.parser.IToken.t_static_cast; +import static org.eclipse.cdt.core.parser.IToken.t_struct; +import static org.eclipse.cdt.core.parser.IToken.t_switch; +import static org.eclipse.cdt.core.parser.IToken.t_template; +import static org.eclipse.cdt.core.parser.IToken.t_this; +import static org.eclipse.cdt.core.parser.IToken.t_throw; +import static org.eclipse.cdt.core.parser.IToken.t_true; +import static org.eclipse.cdt.core.parser.IToken.t_try; +import static org.eclipse.cdt.core.parser.IToken.t_typedef; +import static org.eclipse.cdt.core.parser.IToken.t_typeid; +import static org.eclipse.cdt.core.parser.IToken.t_typename; +import static org.eclipse.cdt.core.parser.IToken.t_union; +import static org.eclipse.cdt.core.parser.IToken.t_unsigned; +import static org.eclipse.cdt.core.parser.IToken.t_using; +import static org.eclipse.cdt.core.parser.IToken.t_virtual; +import static org.eclipse.cdt.core.parser.IToken.t_void; +import static org.eclipse.cdt.core.parser.IToken.t_volatile; +import static org.eclipse.cdt.core.parser.IToken.t_wchar_t; +import static org.eclipse.cdt.core.parser.IToken.t_while; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_And; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_AndAnd; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_AndAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Arrow; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_ArrowStar; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Assign; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Bang; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Caret; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_CaretAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Colon; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_ColonColon; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Comma; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Completion; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Dot; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_DotDotDot; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_DotStar; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_EOF_TOKEN; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_EQ; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_EndOfCompletion; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_GE; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_GT; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Invalid; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_LE; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_LT; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_LeftBrace; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_LeftBracket; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_LeftParen; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_LeftShift; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_LeftShiftAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Minus; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_MinusAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_MinusMinus; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_NE; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Or; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_OrAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_OrOr; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Percent; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_PercentAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Plus; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_PlusAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_PlusPlus; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Question; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_RightBrace; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_RightBracket; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_RightParen; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_RightShift; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_RightShiftAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_SemiColon; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Slash; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_SlashAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Star; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_StarAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_Tilde; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_asm; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_auto; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_bool; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_break; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_case; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_catch; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_char; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_charconst; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_class; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_const; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_const_cast; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_continue; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_default; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_delete; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_do; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_double; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_dynamic_cast; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_else; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_enum; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_explicit; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_export; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_extern; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_false; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_float; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_floating; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_for; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_friend; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_goto; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_identifier; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_if; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_inline; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_int; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_integer; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_long; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_mutable; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_namespace; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_new; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_operator; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_private; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_protected; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_public; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_register; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_reinterpret_cast; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_return; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_short; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_signed; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_sizeof; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_static; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_static_cast; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_stringlit; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_struct; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_switch; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_template; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_this; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_throw; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_true; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_try; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_typedef; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_typeid; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_typename; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_union; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_unsigned; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_using; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_virtual; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_void; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_volatile; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_wchar_t; +import static org.eclipse.cdt.internal.core.dom.lrparser.cpp.CPPParsersym.TK_while; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.parser.IToken; diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/gnu/DOMToGCCTokenMap.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/gnu/DOMToGCCTokenMap.java index e0bda11d4d3..ab23aa22d19 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/gnu/DOMToGCCTokenMap.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/gnu/DOMToGCCTokenMap.java @@ -13,8 +13,204 @@ *******************************************************************************/ package org.eclipse.cdt.core.dom.lrparser.gnu; -import static org.eclipse.cdt.core.parser.IToken.*; -import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.*; +import static org.eclipse.cdt.core.parser.IToken.tAMPER; +import static org.eclipse.cdt.core.parser.IToken.tAMPERASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tAND; +import static org.eclipse.cdt.core.parser.IToken.tARROW; +import static org.eclipse.cdt.core.parser.IToken.tASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tBITCOMPLEMENT; +import static org.eclipse.cdt.core.parser.IToken.tBITOR; +import static org.eclipse.cdt.core.parser.IToken.tBITORASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tCHAR; +import static org.eclipse.cdt.core.parser.IToken.tCOLON; +import static org.eclipse.cdt.core.parser.IToken.tCOMMA; +import static org.eclipse.cdt.core.parser.IToken.tCOMPLETION; +import static org.eclipse.cdt.core.parser.IToken.tDECR; +import static org.eclipse.cdt.core.parser.IToken.tDIV; +import static org.eclipse.cdt.core.parser.IToken.tDIVASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tDOT; +import static org.eclipse.cdt.core.parser.IToken.tELLIPSIS; +import static org.eclipse.cdt.core.parser.IToken.tEND_OF_INPUT; +import static org.eclipse.cdt.core.parser.IToken.tEOC; +import static org.eclipse.cdt.core.parser.IToken.tEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tFLOATINGPT; +import static org.eclipse.cdt.core.parser.IToken.tGT; +import static org.eclipse.cdt.core.parser.IToken.tGTEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tIDENTIFIER; +import static org.eclipse.cdt.core.parser.IToken.tINCR; +import static org.eclipse.cdt.core.parser.IToken.tINTEGER; +import static org.eclipse.cdt.core.parser.IToken.tLBRACE; +import static org.eclipse.cdt.core.parser.IToken.tLBRACKET; +import static org.eclipse.cdt.core.parser.IToken.tLCHAR; +import static org.eclipse.cdt.core.parser.IToken.tLPAREN; +import static org.eclipse.cdt.core.parser.IToken.tLSTRING; +import static org.eclipse.cdt.core.parser.IToken.tLT; +import static org.eclipse.cdt.core.parser.IToken.tLTEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tMINUS; +import static org.eclipse.cdt.core.parser.IToken.tMINUSASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tMOD; +import static org.eclipse.cdt.core.parser.IToken.tMODASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tNOT; +import static org.eclipse.cdt.core.parser.IToken.tNOTEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tOR; +import static org.eclipse.cdt.core.parser.IToken.tPLUS; +import static org.eclipse.cdt.core.parser.IToken.tPLUSASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tQUESTION; +import static org.eclipse.cdt.core.parser.IToken.tRBRACE; +import static org.eclipse.cdt.core.parser.IToken.tRBRACKET; +import static org.eclipse.cdt.core.parser.IToken.tRPAREN; +import static org.eclipse.cdt.core.parser.IToken.tSEMI; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTL; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTLASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTR; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTRASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tSTAR; +import static org.eclipse.cdt.core.parser.IToken.tSTARASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tSTRING; +import static org.eclipse.cdt.core.parser.IToken.tUNKNOWN_CHAR; +import static org.eclipse.cdt.core.parser.IToken.tUTF16CHAR; +import static org.eclipse.cdt.core.parser.IToken.tUTF16STRING; +import static org.eclipse.cdt.core.parser.IToken.tUTF32CHAR; +import static org.eclipse.cdt.core.parser.IToken.tUTF32STRING; +import static org.eclipse.cdt.core.parser.IToken.tXOR; +import static org.eclipse.cdt.core.parser.IToken.tXORASSIGN; +import static org.eclipse.cdt.core.parser.IToken.t__Bool; +import static org.eclipse.cdt.core.parser.IToken.t__Complex; +import static org.eclipse.cdt.core.parser.IToken.t__Imaginary; +import static org.eclipse.cdt.core.parser.IToken.t_asm; +import static org.eclipse.cdt.core.parser.IToken.t_auto; +import static org.eclipse.cdt.core.parser.IToken.t_break; +import static org.eclipse.cdt.core.parser.IToken.t_case; +import static org.eclipse.cdt.core.parser.IToken.t_char; +import static org.eclipse.cdt.core.parser.IToken.t_const; +import static org.eclipse.cdt.core.parser.IToken.t_continue; +import static org.eclipse.cdt.core.parser.IToken.t_default; +import static org.eclipse.cdt.core.parser.IToken.t_do; +import static org.eclipse.cdt.core.parser.IToken.t_double; +import static org.eclipse.cdt.core.parser.IToken.t_else; +import static org.eclipse.cdt.core.parser.IToken.t_enum; +import static org.eclipse.cdt.core.parser.IToken.t_extern; +import static org.eclipse.cdt.core.parser.IToken.t_float; +import static org.eclipse.cdt.core.parser.IToken.t_for; +import static org.eclipse.cdt.core.parser.IToken.t_goto; +import static org.eclipse.cdt.core.parser.IToken.t_if; +import static org.eclipse.cdt.core.parser.IToken.t_inline; +import static org.eclipse.cdt.core.parser.IToken.t_int; +import static org.eclipse.cdt.core.parser.IToken.t_long; +import static org.eclipse.cdt.core.parser.IToken.t_register; +import static org.eclipse.cdt.core.parser.IToken.t_restrict; +import static org.eclipse.cdt.core.parser.IToken.t_return; +import static org.eclipse.cdt.core.parser.IToken.t_short; +import static org.eclipse.cdt.core.parser.IToken.t_signed; +import static org.eclipse.cdt.core.parser.IToken.t_sizeof; +import static org.eclipse.cdt.core.parser.IToken.t_static; +import static org.eclipse.cdt.core.parser.IToken.t_struct; +import static org.eclipse.cdt.core.parser.IToken.t_switch; +import static org.eclipse.cdt.core.parser.IToken.t_typedef; +import static org.eclipse.cdt.core.parser.IToken.t_union; +import static org.eclipse.cdt.core.parser.IToken.t_unsigned; +import static org.eclipse.cdt.core.parser.IToken.t_void; +import static org.eclipse.cdt.core.parser.IToken.t_volatile; +import static org.eclipse.cdt.core.parser.IToken.t_while; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_And; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_AndAnd; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_AndAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Arrow; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Assign; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Bang; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Caret; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_CaretAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Colon; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Comma; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Completion; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Dot; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_DotDotDot; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_EOF_TOKEN; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_EQ; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_EndOfCompletion; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_GE; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_GT; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Invalid; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_LE; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_LT; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_LeftBrace; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_LeftBracket; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_LeftParen; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_LeftShift; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_LeftShiftAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_MAX; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_MIN; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Minus; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_MinusAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_MinusMinus; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_NE; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Or; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_OrAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_OrOr; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Percent; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_PercentAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Plus; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_PlusAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_PlusPlus; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Question; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_RightBrace; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_RightBracket; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_RightParen; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_RightShift; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_RightShiftAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_SemiColon; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Slash; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_SlashAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Star; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_StarAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_Tilde; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK__Bool; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK__Complex; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK__Imaginary; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK___alignof__; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK___attribute__; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK___declspec; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_asm; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_auto; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_break; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_case; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_char; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_charconst; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_const; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_continue; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_default; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_do; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_double; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_else; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_enum; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_extern; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_float; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_floating; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_for; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_goto; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_identifier; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_if; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_inline; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_int; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_integer; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_long; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_register; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_restrict; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_return; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_short; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_signed; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_sizeof; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_static; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_stringlit; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_struct; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_switch; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_typedef; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_typeof; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_union; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_unsigned; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_void; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_volatile; +import static org.eclipse.cdt.internal.core.dom.lrparser.gcc.GCCParsersym.TK_while; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.parser.IGCCToken; diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/gnu/DOMToGPPTokenMap.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/gnu/DOMToGPPTokenMap.java index fc449516b01..8f48d4f4160 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/gnu/DOMToGPPTokenMap.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/gnu/DOMToGPPTokenMap.java @@ -13,8 +13,267 @@ *******************************************************************************/ package org.eclipse.cdt.core.dom.lrparser.gnu; -import static org.eclipse.cdt.core.parser.IToken.*; -import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.*; +import static org.eclipse.cdt.core.parser.IToken.tAMPER; +import static org.eclipse.cdt.core.parser.IToken.tAMPERASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tAND; +import static org.eclipse.cdt.core.parser.IToken.tARROW; +import static org.eclipse.cdt.core.parser.IToken.tARROWSTAR; +import static org.eclipse.cdt.core.parser.IToken.tASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tBITCOMPLEMENT; +import static org.eclipse.cdt.core.parser.IToken.tBITOR; +import static org.eclipse.cdt.core.parser.IToken.tBITORASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tCHAR; +import static org.eclipse.cdt.core.parser.IToken.tCOLON; +import static org.eclipse.cdt.core.parser.IToken.tCOLONCOLON; +import static org.eclipse.cdt.core.parser.IToken.tCOMMA; +import static org.eclipse.cdt.core.parser.IToken.tCOMPLETION; +import static org.eclipse.cdt.core.parser.IToken.tDECR; +import static org.eclipse.cdt.core.parser.IToken.tDIV; +import static org.eclipse.cdt.core.parser.IToken.tDIVASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tDOT; +import static org.eclipse.cdt.core.parser.IToken.tDOTSTAR; +import static org.eclipse.cdt.core.parser.IToken.tELLIPSIS; +import static org.eclipse.cdt.core.parser.IToken.tEND_OF_INPUT; +import static org.eclipse.cdt.core.parser.IToken.tEOC; +import static org.eclipse.cdt.core.parser.IToken.tEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tFLOATINGPT; +import static org.eclipse.cdt.core.parser.IToken.tGT; +import static org.eclipse.cdt.core.parser.IToken.tGTEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tIDENTIFIER; +import static org.eclipse.cdt.core.parser.IToken.tINCR; +import static org.eclipse.cdt.core.parser.IToken.tINTEGER; +import static org.eclipse.cdt.core.parser.IToken.tLBRACE; +import static org.eclipse.cdt.core.parser.IToken.tLBRACKET; +import static org.eclipse.cdt.core.parser.IToken.tLCHAR; +import static org.eclipse.cdt.core.parser.IToken.tLPAREN; +import static org.eclipse.cdt.core.parser.IToken.tLSTRING; +import static org.eclipse.cdt.core.parser.IToken.tLT; +import static org.eclipse.cdt.core.parser.IToken.tLTEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tMINUS; +import static org.eclipse.cdt.core.parser.IToken.tMINUSASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tMOD; +import static org.eclipse.cdt.core.parser.IToken.tMODASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tNOT; +import static org.eclipse.cdt.core.parser.IToken.tNOTEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tOR; +import static org.eclipse.cdt.core.parser.IToken.tPLUS; +import static org.eclipse.cdt.core.parser.IToken.tPLUSASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tPOUND; +import static org.eclipse.cdt.core.parser.IToken.tQUESTION; +import static org.eclipse.cdt.core.parser.IToken.tRBRACE; +import static org.eclipse.cdt.core.parser.IToken.tRBRACKET; +import static org.eclipse.cdt.core.parser.IToken.tRPAREN; +import static org.eclipse.cdt.core.parser.IToken.tSEMI; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTL; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTLASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTR; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTRASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tSTAR; +import static org.eclipse.cdt.core.parser.IToken.tSTARASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tSTRING; +import static org.eclipse.cdt.core.parser.IToken.tUNKNOWN_CHAR; +import static org.eclipse.cdt.core.parser.IToken.tUTF16CHAR; +import static org.eclipse.cdt.core.parser.IToken.tUTF16STRING; +import static org.eclipse.cdt.core.parser.IToken.tUTF32CHAR; +import static org.eclipse.cdt.core.parser.IToken.tUTF32STRING; +import static org.eclipse.cdt.core.parser.IToken.tXOR; +import static org.eclipse.cdt.core.parser.IToken.tXORASSIGN; +import static org.eclipse.cdt.core.parser.IToken.t__Complex; +import static org.eclipse.cdt.core.parser.IToken.t__Imaginary; +import static org.eclipse.cdt.core.parser.IToken.t_asm; +import static org.eclipse.cdt.core.parser.IToken.t_auto; +import static org.eclipse.cdt.core.parser.IToken.t_bool; +import static org.eclipse.cdt.core.parser.IToken.t_break; +import static org.eclipse.cdt.core.parser.IToken.t_case; +import static org.eclipse.cdt.core.parser.IToken.t_catch; +import static org.eclipse.cdt.core.parser.IToken.t_char; +import static org.eclipse.cdt.core.parser.IToken.t_class; +import static org.eclipse.cdt.core.parser.IToken.t_const; +import static org.eclipse.cdt.core.parser.IToken.t_const_cast; +import static org.eclipse.cdt.core.parser.IToken.t_continue; +import static org.eclipse.cdt.core.parser.IToken.t_default; +import static org.eclipse.cdt.core.parser.IToken.t_delete; +import static org.eclipse.cdt.core.parser.IToken.t_do; +import static org.eclipse.cdt.core.parser.IToken.t_double; +import static org.eclipse.cdt.core.parser.IToken.t_dynamic_cast; +import static org.eclipse.cdt.core.parser.IToken.t_else; +import static org.eclipse.cdt.core.parser.IToken.t_enum; +import static org.eclipse.cdt.core.parser.IToken.t_explicit; +import static org.eclipse.cdt.core.parser.IToken.t_export; +import static org.eclipse.cdt.core.parser.IToken.t_extern; +import static org.eclipse.cdt.core.parser.IToken.t_false; +import static org.eclipse.cdt.core.parser.IToken.t_float; +import static org.eclipse.cdt.core.parser.IToken.t_for; +import static org.eclipse.cdt.core.parser.IToken.t_friend; +import static org.eclipse.cdt.core.parser.IToken.t_goto; +import static org.eclipse.cdt.core.parser.IToken.t_if; +import static org.eclipse.cdt.core.parser.IToken.t_inline; +import static org.eclipse.cdt.core.parser.IToken.t_int; +import static org.eclipse.cdt.core.parser.IToken.t_long; +import static org.eclipse.cdt.core.parser.IToken.t_mutable; +import static org.eclipse.cdt.core.parser.IToken.t_namespace; +import static org.eclipse.cdt.core.parser.IToken.t_new; +import static org.eclipse.cdt.core.parser.IToken.t_operator; +import static org.eclipse.cdt.core.parser.IToken.t_private; +import static org.eclipse.cdt.core.parser.IToken.t_protected; +import static org.eclipse.cdt.core.parser.IToken.t_public; +import static org.eclipse.cdt.core.parser.IToken.t_register; +import static org.eclipse.cdt.core.parser.IToken.t_reinterpret_cast; +import static org.eclipse.cdt.core.parser.IToken.t_restrict; +import static org.eclipse.cdt.core.parser.IToken.t_return; +import static org.eclipse.cdt.core.parser.IToken.t_short; +import static org.eclipse.cdt.core.parser.IToken.t_signed; +import static org.eclipse.cdt.core.parser.IToken.t_sizeof; +import static org.eclipse.cdt.core.parser.IToken.t_static; +import static org.eclipse.cdt.core.parser.IToken.t_static_cast; +import static org.eclipse.cdt.core.parser.IToken.t_struct; +import static org.eclipse.cdt.core.parser.IToken.t_switch; +import static org.eclipse.cdt.core.parser.IToken.t_template; +import static org.eclipse.cdt.core.parser.IToken.t_this; +import static org.eclipse.cdt.core.parser.IToken.t_throw; +import static org.eclipse.cdt.core.parser.IToken.t_true; +import static org.eclipse.cdt.core.parser.IToken.t_try; +import static org.eclipse.cdt.core.parser.IToken.t_typedef; +import static org.eclipse.cdt.core.parser.IToken.t_typeid; +import static org.eclipse.cdt.core.parser.IToken.t_typename; +import static org.eclipse.cdt.core.parser.IToken.t_union; +import static org.eclipse.cdt.core.parser.IToken.t_unsigned; +import static org.eclipse.cdt.core.parser.IToken.t_using; +import static org.eclipse.cdt.core.parser.IToken.t_virtual; +import static org.eclipse.cdt.core.parser.IToken.t_void; +import static org.eclipse.cdt.core.parser.IToken.t_volatile; +import static org.eclipse.cdt.core.parser.IToken.t_wchar_t; +import static org.eclipse.cdt.core.parser.IToken.t_while; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_And; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_AndAnd; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_AndAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Arrow; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_ArrowStar; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Assign; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Bang; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Caret; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_CaretAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Colon; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_ColonColon; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Comma; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Completion; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Dot; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_DotDotDot; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_DotStar; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_EOF_TOKEN; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_EQ; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_EndOfCompletion; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_GE; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_GT; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Invalid; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_LE; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_LT; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_LeftBrace; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_LeftBracket; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_LeftParen; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_LeftShift; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_LeftShiftAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_MAX; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_MIN; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Minus; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_MinusAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_MinusMinus; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_NE; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Or; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_OrAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_OrOr; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Percent; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_PercentAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Plus; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_PlusAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_PlusPlus; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Question; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_RightBrace; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_RightBracket; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_RightParen; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_RightShift; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_RightShiftAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_SemiColon; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Slash; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_SlashAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Star; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_StarAssign; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_Tilde; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK__Complex; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK__Imaginary; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK___alignof__; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK___attribute__; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK___declspec; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_asm; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_auto; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_bool; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_break; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_case; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_catch; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_char; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_charconst; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_class; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_const; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_const_cast; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_continue; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_default; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_delete; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_do; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_double; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_dynamic_cast; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_else; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_enum; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_explicit; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_export; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_extern; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_false; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_float; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_floating; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_for; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_friend; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_goto; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_identifier; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_if; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_inline; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_int; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_integer; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_long; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_mutable; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_namespace; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_new; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_operator; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_private; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_protected; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_public; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_register; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_reinterpret_cast; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_restrict; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_return; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_short; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_signed; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_sizeof; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_static; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_static_cast; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_stringlit; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_struct; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_switch; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_template; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_this; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_throw; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_true; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_try; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_typedef; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_typeid; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_typename; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_typeof; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_union; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_unsigned; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_using; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_virtual; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_void; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_volatile; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_wchar_t; +import static org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym.TK_while; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.parser.IGCCToken; diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/lpgextensions/FixedBacktrackingParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/lpgextensions/FixedBacktrackingParser.java index ac1a65cf8f3..f0646c2e4a0 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/lpgextensions/FixedBacktrackingParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/lpgextensions/FixedBacktrackingParser.java @@ -21,7 +21,6 @@ import lpg.lpgjavaruntime.IntTuple; import lpg.lpgjavaruntime.Monitor; import lpg.lpgjavaruntime.NotBacktrackParseTableException; import lpg.lpgjavaruntime.ParseTable; -import lpg.lpgjavaruntime.PrsStream; import lpg.lpgjavaruntime.RuleAction; import lpg.lpgjavaruntime.Stacks; import lpg.lpgjavaruntime.TokenStream; diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99ExpressionParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99ExpressionParser.java index 6ee544bfc2e..d1942165a46 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99ExpressionParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99ExpressionParser.java @@ -16,28 +16,52 @@ package org.eclipse.cdt.internal.core.dom.lrparser.c99; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.IASTCastExpression; +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTExpression; +import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; +import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; +import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; -import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; -import org.eclipse.cdt.core.index.IIndex; - -import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.TokenMap; -import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; - -import org.eclipse.cdt.internal.core.dom.parser.c.CNodeFactory; import org.eclipse.cdt.core.dom.lrparser.action.c99.C99BuildASTParserAction; import org.eclipse.cdt.core.dom.lrparser.action.c99.C99SecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; +import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.internal.core.dom.parser.c.CNodeFactory; + +import lpg.lpgjavaruntime.BadParseException; +import lpg.lpgjavaruntime.BadParseSymFileException; +import lpg.lpgjavaruntime.DiagnoseParser; +import lpg.lpgjavaruntime.ErrorToken; +import lpg.lpgjavaruntime.IToken; +import lpg.lpgjavaruntime.LexStream; +import lpg.lpgjavaruntime.Monitor; +import lpg.lpgjavaruntime.NotBacktrackParseTableException; +import lpg.lpgjavaruntime.NullExportedSymbolsException; +import lpg.lpgjavaruntime.NullTerminalSymbolsException; +import lpg.lpgjavaruntime.ParseErrorCodes; +import lpg.lpgjavaruntime.ParseTable; +import lpg.lpgjavaruntime.PrsStream; +import lpg.lpgjavaruntime.RuleAction; +import lpg.lpgjavaruntime.Token; +import lpg.lpgjavaruntime.UndefinedEofSymbolException; +import lpg.lpgjavaruntime.UnimplementedTerminalsException; public class C99ExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTExpression>, ISecondaryParser<IASTExpression> { diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99NoCastExpressionParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99NoCastExpressionParser.java index 0d0550b11dd..d1aec14f116 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99NoCastExpressionParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99NoCastExpressionParser.java @@ -16,28 +16,51 @@ package org.eclipse.cdt.internal.core.dom.lrparser.c99; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTExpression; +import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; +import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; +import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; -import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; -import org.eclipse.cdt.core.index.IIndex; - -import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.TokenMap; -import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; - -import org.eclipse.cdt.internal.core.dom.parser.c.CNodeFactory; import org.eclipse.cdt.core.dom.lrparser.action.c99.C99BuildASTParserAction; import org.eclipse.cdt.core.dom.lrparser.action.c99.C99SecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; +import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.internal.core.dom.parser.c.CNodeFactory; + +import lpg.lpgjavaruntime.BadParseException; +import lpg.lpgjavaruntime.BadParseSymFileException; +import lpg.lpgjavaruntime.DiagnoseParser; +import lpg.lpgjavaruntime.ErrorToken; +import lpg.lpgjavaruntime.IToken; +import lpg.lpgjavaruntime.LexStream; +import lpg.lpgjavaruntime.Monitor; +import lpg.lpgjavaruntime.NotBacktrackParseTableException; +import lpg.lpgjavaruntime.NullExportedSymbolsException; +import lpg.lpgjavaruntime.NullTerminalSymbolsException; +import lpg.lpgjavaruntime.ParseErrorCodes; +import lpg.lpgjavaruntime.ParseTable; +import lpg.lpgjavaruntime.PrsStream; +import lpg.lpgjavaruntime.RuleAction; +import lpg.lpgjavaruntime.Token; +import lpg.lpgjavaruntime.UndefinedEofSymbolException; +import lpg.lpgjavaruntime.UnimplementedTerminalsException; public class C99NoCastExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTExpression>, ISecondaryParser<IASTExpression> { diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99Parser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99Parser.java index ba7dfef971c..011cc7bf8e2 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99Parser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99Parser.java @@ -16,24 +16,48 @@ package org.eclipse.cdt.internal.core.dom.lrparser.c99; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.IASTCastExpression; +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.core.dom.lrparser.action.c99.C99BuildASTParserAction; +import org.eclipse.cdt.core.dom.lrparser.action.c99.C99SecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; import org.eclipse.cdt.core.index.IIndex; - +import org.eclipse.cdt.core.parser.IScanner; import org.eclipse.cdt.internal.core.dom.parser.c.CNodeFactory; -import org.eclipse.cdt.core.dom.lrparser.action.c99.C99BuildASTParserAction; -import org.eclipse.cdt.core.dom.lrparser.action.c99.C99SecondaryParserFactory; + +import lpg.lpgjavaruntime.BadParseException; +import lpg.lpgjavaruntime.BadParseSymFileException; +import lpg.lpgjavaruntime.DiagnoseParser; +import lpg.lpgjavaruntime.ErrorToken; +import lpg.lpgjavaruntime.IToken; +import lpg.lpgjavaruntime.LexStream; +import lpg.lpgjavaruntime.Monitor; +import lpg.lpgjavaruntime.NotBacktrackParseTableException; +import lpg.lpgjavaruntime.NullExportedSymbolsException; +import lpg.lpgjavaruntime.NullTerminalSymbolsException; +import lpg.lpgjavaruntime.ParseErrorCodes; +import lpg.lpgjavaruntime.ParseTable; +import lpg.lpgjavaruntime.PrsStream; +import lpg.lpgjavaruntime.RuleAction; +import lpg.lpgjavaruntime.UndefinedEofSymbolException; +import lpg.lpgjavaruntime.UnimplementedTerminalsException; public class C99Parser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTTranslationUnit> diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99SizeofExpressionParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99SizeofExpressionParser.java index 6fa2fa3ad35..eb472080d1a 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99SizeofExpressionParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99SizeofExpressionParser.java @@ -16,28 +16,51 @@ package org.eclipse.cdt.internal.core.dom.lrparser.c99; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.IASTCastExpression; +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTExpression; +import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; +import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; +import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; -import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; -import org.eclipse.cdt.core.index.IIndex; - -import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.TokenMap; -import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; - -import org.eclipse.cdt.internal.core.dom.parser.c.CNodeFactory; import org.eclipse.cdt.core.dom.lrparser.action.c99.C99BuildASTParserAction; import org.eclipse.cdt.core.dom.lrparser.action.c99.C99SecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; +import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.internal.core.dom.parser.c.CNodeFactory; + +import lpg.lpgjavaruntime.BadParseException; +import lpg.lpgjavaruntime.BadParseSymFileException; +import lpg.lpgjavaruntime.DiagnoseParser; +import lpg.lpgjavaruntime.ErrorToken; +import lpg.lpgjavaruntime.IToken; +import lpg.lpgjavaruntime.LexStream; +import lpg.lpgjavaruntime.Monitor; +import lpg.lpgjavaruntime.NotBacktrackParseTableException; +import lpg.lpgjavaruntime.NullExportedSymbolsException; +import lpg.lpgjavaruntime.NullTerminalSymbolsException; +import lpg.lpgjavaruntime.ParseErrorCodes; +import lpg.lpgjavaruntime.ParseTable; +import lpg.lpgjavaruntime.PrsStream; +import lpg.lpgjavaruntime.RuleAction; +import lpg.lpgjavaruntime.Token; +import lpg.lpgjavaruntime.UndefinedEofSymbolException; +import lpg.lpgjavaruntime.UnimplementedTerminalsException; public class C99SizeofExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTExpression>, ISecondaryParser<IASTExpression> { diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionParser.java index 111167f1b3e..273ba36cb53 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionParser.java @@ -16,29 +16,51 @@ package org.eclipse.cdt.internal.core.dom.lrparser.cpp; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTExpression; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUnaryExpression; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; +import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; +import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; -import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; -import org.eclipse.cdt.core.index.IIndex; - -import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.TokenMap; -import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; - -import org.eclipse.cdt.core.dom.ast.cpp.*; -import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction; import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; +import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; + +import lpg.lpgjavaruntime.BadParseException; +import lpg.lpgjavaruntime.BadParseSymFileException; +import lpg.lpgjavaruntime.DiagnoseParser; +import lpg.lpgjavaruntime.ErrorToken; +import lpg.lpgjavaruntime.IToken; +import lpg.lpgjavaruntime.LexStream; +import lpg.lpgjavaruntime.Monitor; +import lpg.lpgjavaruntime.NotBacktrackParseTableException; +import lpg.lpgjavaruntime.NullExportedSymbolsException; +import lpg.lpgjavaruntime.NullTerminalSymbolsException; +import lpg.lpgjavaruntime.ParseErrorCodes; +import lpg.lpgjavaruntime.ParseTable; +import lpg.lpgjavaruntime.PrsStream; +import lpg.lpgjavaruntime.RuleAction; +import lpg.lpgjavaruntime.Token; +import lpg.lpgjavaruntime.UndefinedEofSymbolException; +import lpg.lpgjavaruntime.UnimplementedTerminalsException; public class CPPExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTExpression>, ISecondaryParser<IASTExpression> { diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParser.java index e9f1c77a09b..3e97046ad6f 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParser.java @@ -16,29 +16,51 @@ package org.eclipse.cdt.internal.core.dom.lrparser.cpp; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTExpression; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUnaryExpression; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; +import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; +import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; -import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; -import org.eclipse.cdt.core.index.IIndex; - -import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.TokenMap; -import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; - -import org.eclipse.cdt.core.dom.ast.cpp.*; -import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction; import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; +import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; + +import lpg.lpgjavaruntime.BadParseException; +import lpg.lpgjavaruntime.BadParseSymFileException; +import lpg.lpgjavaruntime.DiagnoseParser; +import lpg.lpgjavaruntime.ErrorToken; +import lpg.lpgjavaruntime.IToken; +import lpg.lpgjavaruntime.LexStream; +import lpg.lpgjavaruntime.Monitor; +import lpg.lpgjavaruntime.NotBacktrackParseTableException; +import lpg.lpgjavaruntime.NullExportedSymbolsException; +import lpg.lpgjavaruntime.NullTerminalSymbolsException; +import lpg.lpgjavaruntime.ParseErrorCodes; +import lpg.lpgjavaruntime.ParseTable; +import lpg.lpgjavaruntime.PrsStream; +import lpg.lpgjavaruntime.RuleAction; +import lpg.lpgjavaruntime.Token; +import lpg.lpgjavaruntime.UndefinedEofSymbolException; +import lpg.lpgjavaruntime.UnimplementedTerminalsException; public class CPPNoCastExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTExpression>, ISecondaryParser<IASTExpression> { diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoFunctionDeclaratorParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoFunctionDeclaratorParser.java index e325e255e01..baac3dd691d 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoFunctionDeclaratorParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoFunctionDeclaratorParser.java @@ -16,29 +16,51 @@ package org.eclipse.cdt.internal.core.dom.lrparser.cpp; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTDeclarator; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUnaryExpression; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; +import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; +import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; -import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; -import org.eclipse.cdt.core.index.IIndex; - -import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.TokenMap; -import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; - -import org.eclipse.cdt.core.dom.ast.cpp.*; -import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction; import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; +import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; + +import lpg.lpgjavaruntime.BadParseException; +import lpg.lpgjavaruntime.BadParseSymFileException; +import lpg.lpgjavaruntime.DiagnoseParser; +import lpg.lpgjavaruntime.ErrorToken; +import lpg.lpgjavaruntime.IToken; +import lpg.lpgjavaruntime.LexStream; +import lpg.lpgjavaruntime.Monitor; +import lpg.lpgjavaruntime.NotBacktrackParseTableException; +import lpg.lpgjavaruntime.NullExportedSymbolsException; +import lpg.lpgjavaruntime.NullTerminalSymbolsException; +import lpg.lpgjavaruntime.ParseErrorCodes; +import lpg.lpgjavaruntime.ParseTable; +import lpg.lpgjavaruntime.PrsStream; +import lpg.lpgjavaruntime.RuleAction; +import lpg.lpgjavaruntime.Token; +import lpg.lpgjavaruntime.UndefinedEofSymbolException; +import lpg.lpgjavaruntime.UnimplementedTerminalsException; public class CPPNoFunctionDeclaratorParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTDeclarator>, ISecondaryParser<IASTDeclarator> { diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPParser.java index 70f695d9542..9eaecd071bc 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPParser.java @@ -16,25 +16,47 @@ package org.eclipse.cdt.internal.core.dom.lrparser.cpp; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUnaryExpression; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction; +import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; import org.eclipse.cdt.core.index.IIndex; - -import org.eclipse.cdt.core.dom.ast.cpp.*; +import org.eclipse.cdt.core.parser.IScanner; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; -import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction; -import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory; + +import lpg.lpgjavaruntime.BadParseException; +import lpg.lpgjavaruntime.BadParseSymFileException; +import lpg.lpgjavaruntime.DiagnoseParser; +import lpg.lpgjavaruntime.ErrorToken; +import lpg.lpgjavaruntime.IToken; +import lpg.lpgjavaruntime.LexStream; +import lpg.lpgjavaruntime.Monitor; +import lpg.lpgjavaruntime.NotBacktrackParseTableException; +import lpg.lpgjavaruntime.NullExportedSymbolsException; +import lpg.lpgjavaruntime.NullTerminalSymbolsException; +import lpg.lpgjavaruntime.ParseErrorCodes; +import lpg.lpgjavaruntime.ParseTable; +import lpg.lpgjavaruntime.PrsStream; +import lpg.lpgjavaruntime.RuleAction; +import lpg.lpgjavaruntime.UndefinedEofSymbolException; +import lpg.lpgjavaruntime.UnimplementedTerminalsException; public class CPPParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTTranslationUnit> diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPRules.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPRules.java index 7e703117e92..0d61e686ebd 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPRules.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPRules.java @@ -13,8 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.lrparser.cpp; -import java.util.Map; import java.util.HashMap; +import java.util.Map; public class CPPRules { static Map fRules = new HashMap(); diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPSizeofExpressionParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPSizeofExpressionParser.java index d0f077afe4b..9ba3c8bf77c 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPSizeofExpressionParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPSizeofExpressionParser.java @@ -16,29 +16,50 @@ package org.eclipse.cdt.internal.core.dom.lrparser.cpp; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTExpression; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUnaryExpression; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; +import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; +import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; -import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; -import org.eclipse.cdt.core.index.IIndex; - -import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.TokenMap; -import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; - -import org.eclipse.cdt.core.dom.ast.cpp.*; -import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction; import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; +import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; + +import lpg.lpgjavaruntime.BadParseException; +import lpg.lpgjavaruntime.BadParseSymFileException; +import lpg.lpgjavaruntime.DiagnoseParser; +import lpg.lpgjavaruntime.ErrorToken; +import lpg.lpgjavaruntime.IToken; +import lpg.lpgjavaruntime.LexStream; +import lpg.lpgjavaruntime.Monitor; +import lpg.lpgjavaruntime.NotBacktrackParseTableException; +import lpg.lpgjavaruntime.NullExportedSymbolsException; +import lpg.lpgjavaruntime.NullTerminalSymbolsException; +import lpg.lpgjavaruntime.ParseErrorCodes; +import lpg.lpgjavaruntime.ParseTable; +import lpg.lpgjavaruntime.PrsStream; +import lpg.lpgjavaruntime.RuleAction; +import lpg.lpgjavaruntime.Token; +import lpg.lpgjavaruntime.UndefinedEofSymbolException; +import lpg.lpgjavaruntime.UnimplementedTerminalsException; public class CPPSizeofExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTExpression>, ISecondaryParser<IASTExpression> { diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPTemplateTypeParameterParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPTemplateTypeParameterParser.java index d0e99cb7652..a8044972e2b 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPTemplateTypeParameterParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPTemplateTypeParameterParser.java @@ -16,31 +16,51 @@ package org.eclipse.cdt.internal.core.dom.lrparser.cpp; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateParameter; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUnaryExpression; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; +import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; +import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; -import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; -import org.eclipse.cdt.core.index.IIndex; - -import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.TokenMap; -import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; - -import org.eclipse.cdt.core.dom.ast.cpp.*; -import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction; import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; +import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; -import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateParameter; +import lpg.lpgjavaruntime.BadParseException; +import lpg.lpgjavaruntime.BadParseSymFileException; +import lpg.lpgjavaruntime.DiagnoseParser; +import lpg.lpgjavaruntime.ErrorToken; +import lpg.lpgjavaruntime.IToken; +import lpg.lpgjavaruntime.LexStream; +import lpg.lpgjavaruntime.Monitor; +import lpg.lpgjavaruntime.NotBacktrackParseTableException; +import lpg.lpgjavaruntime.NullExportedSymbolsException; +import lpg.lpgjavaruntime.NullTerminalSymbolsException; +import lpg.lpgjavaruntime.ParseErrorCodes; +import lpg.lpgjavaruntime.ParseTable; +import lpg.lpgjavaruntime.PrsStream; +import lpg.lpgjavaruntime.RuleAction; +import lpg.lpgjavaruntime.Token; +import lpg.lpgjavaruntime.UndefinedEofSymbolException; +import lpg.lpgjavaruntime.UnimplementedTerminalsException; public class CPPTemplateTypeParameterParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<ICPPASTTemplateParameter>, ISecondaryParser<ICPPASTTemplateParameter> { diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCParser.java index f0d1497e450..550bfaa011a 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCParser.java @@ -16,29 +16,49 @@ package org.eclipse.cdt.internal.core.dom.lrparser.gcc; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.IASTCastExpression; +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCBuildASTParserAction; +import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCSecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.action.gnu.GNUBuildASTParserAction; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; import org.eclipse.cdt.core.index.IIndex; - +import org.eclipse.cdt.core.parser.IScanner; import org.eclipse.cdt.internal.core.dom.parser.c.CNodeFactory; -import org.eclipse.cdt.core.dom.lrparser.action.c99.C99BuildASTParserAction; -import org.eclipse.cdt.core.dom.lrparser.action.c99.C99SecondaryParserFactory; -import org.eclipse.cdt.core.dom.lrparser.action.gnu.GNUBuildASTParserAction; - -import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCBuildASTParserAction; -import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCSecondaryParserFactory; +import lpg.lpgjavaruntime.BadParseException; +import lpg.lpgjavaruntime.BadParseSymFileException; +import lpg.lpgjavaruntime.DiagnoseParser; +import lpg.lpgjavaruntime.ErrorToken; +import lpg.lpgjavaruntime.IToken; +import lpg.lpgjavaruntime.LexStream; +import lpg.lpgjavaruntime.Monitor; +import lpg.lpgjavaruntime.NotBacktrackParseTableException; +import lpg.lpgjavaruntime.NullExportedSymbolsException; +import lpg.lpgjavaruntime.NullTerminalSymbolsException; +import lpg.lpgjavaruntime.ParseErrorCodes; +import lpg.lpgjavaruntime.ParseTable; +import lpg.lpgjavaruntime.PrsStream; +import lpg.lpgjavaruntime.RuleAction; +import lpg.lpgjavaruntime.UndefinedEofSymbolException; +import lpg.lpgjavaruntime.UnimplementedTerminalsException; public class GCCParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTTranslationUnit> diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCSizeofExpressionParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCSizeofExpressionParser.java index c29d6e6e87a..b61e1f616e1 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCSizeofExpressionParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCSizeofExpressionParser.java @@ -16,33 +16,53 @@ package org.eclipse.cdt.internal.core.dom.lrparser.gcc; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.IASTCastExpression; +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTExpression; +import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; +import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; +import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.core.dom.lrparser.action.TokenMap; +import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCBuildASTParserAction; +import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCSecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.action.gnu.GNUBuildASTParserAction; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; import org.eclipse.cdt.core.index.IIndex; - -import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; -import org.eclipse.cdt.core.dom.lrparser.action.TokenMap; -import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; - +import org.eclipse.cdt.core.parser.IScanner; import org.eclipse.cdt.internal.core.dom.parser.c.CNodeFactory; -import org.eclipse.cdt.core.dom.lrparser.action.c99.C99BuildASTParserAction; -import org.eclipse.cdt.core.dom.lrparser.action.c99.C99SecondaryParserFactory; - -import org.eclipse.cdt.core.dom.lrparser.action.gnu.GNUBuildASTParserAction; -import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCBuildASTParserAction; -import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCSecondaryParserFactory; +import lpg.lpgjavaruntime.BadParseException; +import lpg.lpgjavaruntime.BadParseSymFileException; +import lpg.lpgjavaruntime.DiagnoseParser; +import lpg.lpgjavaruntime.ErrorToken; +import lpg.lpgjavaruntime.IToken; +import lpg.lpgjavaruntime.LexStream; +import lpg.lpgjavaruntime.Monitor; +import lpg.lpgjavaruntime.NotBacktrackParseTableException; +import lpg.lpgjavaruntime.NullExportedSymbolsException; +import lpg.lpgjavaruntime.NullTerminalSymbolsException; +import lpg.lpgjavaruntime.ParseErrorCodes; +import lpg.lpgjavaruntime.ParseTable; +import lpg.lpgjavaruntime.PrsStream; +import lpg.lpgjavaruntime.RuleAction; +import lpg.lpgjavaruntime.Token; +import lpg.lpgjavaruntime.UndefinedEofSymbolException; +import lpg.lpgjavaruntime.UnimplementedTerminalsException; public class GCCSizeofExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTExpression>, ISecondaryParser<IASTExpression> { diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPParser.java index bd89af415e4..ab3c2e7ed2f 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPParser.java @@ -16,31 +16,51 @@ package org.eclipse.cdt.internal.core.dom.lrparser.gpp; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUnaryExpression; +import org.eclipse.cdt.core.dom.ast.gnu.cpp.IGPPASTExplicitTemplateInstantiation; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.core.dom.lrparser.action.gnu.GNUBuildASTParserAction; +import org.eclipse.cdt.core.dom.lrparser.action.gnu.GPPBuildASTParserAction; +import org.eclipse.cdt.core.dom.lrparser.action.gnu.GPPSecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; import org.eclipse.cdt.core.index.IIndex; - -import org.eclipse.cdt.core.dom.ast.cpp.*; +import org.eclipse.cdt.core.parser.IScanner; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; -import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction; -import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory; -import org.eclipse.cdt.core.dom.lrparser.action.gnu.GNUBuildASTParserAction; - -import org.eclipse.cdt.core.dom.lrparser.action.gnu.GPPBuildASTParserAction; -import org.eclipse.cdt.core.dom.lrparser.action.gnu.GPPSecondaryParserFactory; -import org.eclipse.cdt.core.dom.ast.gnu.cpp.*; +import lpg.lpgjavaruntime.BadParseException; +import lpg.lpgjavaruntime.BadParseSymFileException; +import lpg.lpgjavaruntime.DiagnoseParser; +import lpg.lpgjavaruntime.ErrorToken; +import lpg.lpgjavaruntime.IToken; +import lpg.lpgjavaruntime.LexStream; +import lpg.lpgjavaruntime.Monitor; +import lpg.lpgjavaruntime.NotBacktrackParseTableException; +import lpg.lpgjavaruntime.NullExportedSymbolsException; +import lpg.lpgjavaruntime.NullTerminalSymbolsException; +import lpg.lpgjavaruntime.ParseErrorCodes; +import lpg.lpgjavaruntime.ParseTable; +import lpg.lpgjavaruntime.PrsStream; +import lpg.lpgjavaruntime.RuleAction; +import lpg.lpgjavaruntime.UndefinedEofSymbolException; +import lpg.lpgjavaruntime.UnimplementedTerminalsException; public class GPPParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTTranslationUnit> diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPSizeofExpressionParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPSizeofExpressionParser.java index 49230324045..61af36c4800 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPSizeofExpressionParser.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPSizeofExpressionParser.java @@ -16,35 +16,54 @@ package org.eclipse.cdt.internal.core.dom.lrparser.gpp; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTExpression; +import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUnaryExpression; +import org.eclipse.cdt.core.dom.ast.gnu.cpp.IGPPASTExplicitTemplateInstantiation; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; +import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; +import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; -import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; -import org.eclipse.cdt.core.index.IIndex; - -import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.TokenMap; -import org.eclipse.cdt.core.dom.lrparser.ISecondaryParser; - -import org.eclipse.cdt.core.dom.ast.cpp.*; -import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; -import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction; -import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory; - import org.eclipse.cdt.core.dom.lrparser.action.gnu.GNUBuildASTParserAction; - import org.eclipse.cdt.core.dom.lrparser.action.gnu.GPPBuildASTParserAction; import org.eclipse.cdt.core.dom.lrparser.action.gnu.GPPSecondaryParserFactory; -import org.eclipse.cdt.core.dom.ast.gnu.cpp.*; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; +import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; +import org.eclipse.cdt.core.index.IIndex; +import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory; + +import lpg.lpgjavaruntime.BadParseException; +import lpg.lpgjavaruntime.BadParseSymFileException; +import lpg.lpgjavaruntime.DiagnoseParser; +import lpg.lpgjavaruntime.ErrorToken; +import lpg.lpgjavaruntime.IToken; +import lpg.lpgjavaruntime.LexStream; +import lpg.lpgjavaruntime.Monitor; +import lpg.lpgjavaruntime.NotBacktrackParseTableException; +import lpg.lpgjavaruntime.NullExportedSymbolsException; +import lpg.lpgjavaruntime.NullTerminalSymbolsException; +import lpg.lpgjavaruntime.ParseErrorCodes; +import lpg.lpgjavaruntime.ParseTable; +import lpg.lpgjavaruntime.PrsStream; +import lpg.lpgjavaruntime.RuleAction; +import lpg.lpgjavaruntime.Token; +import lpg.lpgjavaruntime.UndefinedEofSymbolException; +import lpg.lpgjavaruntime.UnimplementedTerminalsException; public class GPPSizeofExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTExpression>, ISecondaryParser<IASTExpression> { diff --git a/lsp/org.eclipse.cdt.lsp.core.tests/src/org/eclipse/cdt/lsp/core/tests/cquery/CqueryJsonParseTest.java b/lsp/org.eclipse.cdt.lsp.core.tests/src/org/eclipse/cdt/lsp/core/tests/cquery/CqueryJsonParseTest.java index f31ea4e1979..2d9b0ef08fd 100644 --- a/lsp/org.eclipse.cdt.lsp.core.tests/src/org/eclipse/cdt/lsp/core/tests/cquery/CqueryJsonParseTest.java +++ b/lsp/org.eclipse.cdt.lsp.core.tests/src/org/eclipse/cdt/lsp/core/tests/cquery/CqueryJsonParseTest.java @@ -17,12 +17,17 @@ import java.util.List; import java.util.Map; import org.eclipse.cdt.lsp.core.Server2ClientProtocolExtension; -import org.eclipse.cdt.lsp.core.cquery.*; +import org.eclipse.cdt.lsp.core.cquery.CqueryInactiveRegions; +import org.eclipse.cdt.lsp.core.cquery.CquerySemanticHighlights; +import org.eclipse.cdt.lsp.core.cquery.ExtendedSymbolKindType; +import org.eclipse.cdt.lsp.core.cquery.HighlightSymbol; +import org.eclipse.cdt.lsp.core.cquery.IndexingProgressStats; +import org.eclipse.cdt.lsp.core.cquery.StorageClass; import org.eclipse.lsp4j.Position; import org.eclipse.lsp4j.Range; import org.eclipse.lsp4j.jsonrpc.json.JsonRpcMethod; import org.eclipse.lsp4j.jsonrpc.json.MessageJsonHandler; -import org.eclipse.lsp4j.jsonrpc.messages.*; +import org.eclipse.lsp4j.jsonrpc.messages.NotificationMessage; import org.eclipse.lsp4j.jsonrpc.services.ServiceEndpoints; import org.junit.Assert; import org.junit.Test; diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPLanguageServerPreferencePage.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPLanguageServerPreferencePage.java index 34bf78c6cdd..41cd031a3d6 100644 --- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPLanguageServerPreferencePage.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPLanguageServerPreferencePage.java @@ -13,10 +13,14 @@ package org.eclipse.cdt.lsp.core; import java.io.File; -import org.eclipse.jface.preference.*; +import org.eclipse.jface.preference.FieldEditor; +import org.eclipse.jface.preference.FieldEditorPreferencePage; +import org.eclipse.jface.preference.FileFieldEditor; +import org.eclipse.jface.preference.RadioGroupFieldEditor; +import org.eclipse.jface.preference.StringFieldEditor; import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPreferencePage; /** * This class represents the preference page for C/C++ Language Server. diff --git a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/PlainTextExporter.java b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/PlainTextExporter.java index 3ca3b27085b..c138928fafc 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/PlainTextExporter.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/PlainTextExporter.java @@ -18,6 +18,7 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.math.BigInteger; + import org.eclipse.cdt.debug.ui.memory.transport.model.IMemoryExporter; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; diff --git a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/RAWBinaryExporter.java b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/RAWBinaryExporter.java index f97ecec82e9..850611fcee1 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/RAWBinaryExporter.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/RAWBinaryExporter.java @@ -18,6 +18,7 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.math.BigInteger; + import org.eclipse.cdt.debug.ui.memory.transport.model.IMemoryExporter; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; diff --git a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/SRecordExporter.java b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/SRecordExporter.java index f4088ff29a1..d3bc18374ec 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/SRecordExporter.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/SRecordExporter.java @@ -18,6 +18,7 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.math.BigInteger; + import org.eclipse.cdt.debug.ui.memory.transport.model.IMemoryExporter; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; diff --git a/qt/org.eclipse.cdt.qt.core.tests/src/org/eclipse/cdt/qt/core/tests/NashornTests.java b/qt/org.eclipse.cdt.qt.core.tests/src/org/eclipse/cdt/qt/core/tests/NashornTests.java index 03161e8f6e6..cece6b52de8 100644 --- a/qt/org.eclipse.cdt.qt.core.tests/src/org/eclipse/cdt/qt/core/tests/NashornTests.java +++ b/qt/org.eclipse.cdt.qt.core.tests/src/org/eclipse/cdt/qt/core/tests/NashornTests.java @@ -10,8 +10,12 @@ *******************************************************************************/ package org.eclipse.cdt.qt.core.tests; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.hamcrest.CoreMatchers.instanceOf; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; import java.util.Collection; import java.util.HashMap; diff --git a/qt/org.eclipse.cdt.qt.core.tests/src/org/eclipse/cdt/qt/core/tests/QMLDirectoryLexerTests.java b/qt/org.eclipse.cdt.qt.core.tests/src/org/eclipse/cdt/qt/core/tests/QMLDirectoryLexerTests.java index b8fe42efd58..e93627d2b56 100644 --- a/qt/org.eclipse.cdt.qt.core.tests/src/org/eclipse/cdt/qt/core/tests/QMLDirectoryLexerTests.java +++ b/qt/org.eclipse.cdt.qt.core.tests/src/org/eclipse/cdt/qt/core/tests/QMLDirectoryLexerTests.java @@ -13,7 +13,7 @@ *******************************************************************************/ package org.eclipse.cdt.qt.core.tests; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/qt/org.eclipse.cdt.qt.core.tests/src/org/eclipse/cdt/qt/core/tests/QMLDirectoryParserTests.java b/qt/org.eclipse.cdt.qt.core.tests/src/org/eclipse/cdt/qt/core/tests/QMLDirectoryParserTests.java index b0220e2f0a3..d1515119a00 100644 --- a/qt/org.eclipse.cdt.qt.core.tests/src/org/eclipse/cdt/qt/core/tests/QMLDirectoryParserTests.java +++ b/qt/org.eclipse.cdt.qt.core.tests/src/org/eclipse/cdt/qt/core/tests/QMLDirectoryParserTests.java @@ -13,8 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.qt.core.tests; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.hamcrest.CoreMatchers.instanceOf; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/codan/QtSyntaxChecker.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/codan/QtSyntaxChecker.java index 2bf198cd561..23c2c92d64e 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/codan/QtSyntaxChecker.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/codan/QtSyntaxChecker.java @@ -22,10 +22,10 @@ import org.eclipse.cdt.core.dom.ast.IASTFunctionCallExpression; import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.internal.qt.core.ASTUtil; +import org.eclipse.cdt.internal.qt.core.Activator; import org.eclipse.cdt.internal.qt.core.QtFunctionCall; import org.eclipse.cdt.internal.qt.core.QtMethodReference; import org.eclipse.cdt.internal.qt.core.QtNature; -import org.eclipse.cdt.internal.qt.core.Activator; import org.eclipse.cdt.internal.qt.core.index.IQMethod; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.OperationCanceledException; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QGadget.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QGadget.java index f046cc6dc64..0d2f4306bfc 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QGadget.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QGadget.java @@ -14,8 +14,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.eclipse.cdt.internal.qt.core.pdom.QtPDOMQEnum; import org.eclipse.cdt.internal.qt.core.pdom.AbstractQtPDOMClass; +import org.eclipse.cdt.internal.qt.core.pdom.QtPDOMQEnum; import org.eclipse.core.runtime.CoreException; public class QGadget implements IQGadget { diff --git a/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QMakeTests.java b/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QMakeTests.java index 9f8f087a098..dd5cded546a 100644 --- a/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QMakeTests.java +++ b/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QMakeTests.java @@ -16,13 +16,13 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import junit.framework.TestCase; - import org.eclipse.cdt.internal.qt.core.index.IQMakeInfo; import org.eclipse.cdt.internal.qt.core.index.QMakeInfo; import org.eclipse.cdt.internal.qt.core.index.QMakeParser; import org.eclipse.cdt.internal.qt.core.index.QMakeVersion; +import junit.framework.TestCase; + public class QMakeTests extends TestCase { public void testQMakeVersion() throws Exception { diff --git a/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QObjectTests.java b/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QObjectTests.java index 88b021a8d9e..4617dbb955c 100644 --- a/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QObjectTests.java +++ b/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QObjectTests.java @@ -25,8 +25,8 @@ import org.eclipse.cdt.internal.qt.core.index.IQEnum; import org.eclipse.cdt.internal.qt.core.index.IQMethod; import org.eclipse.cdt.internal.qt.core.index.IQObject; import org.eclipse.cdt.internal.qt.core.index.IQProperty; -import org.eclipse.cdt.internal.qt.core.index.QtIndex; import org.eclipse.cdt.internal.qt.core.index.IQProperty.Attribute; +import org.eclipse.cdt.internal.qt.core.index.QtIndex; public class QObjectTests extends BaseQtTestCase { diff --git a/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QtContentAssistantTests.java b/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QtContentAssistantTests.java index dca8a473c7e..77a07cecb04 100644 --- a/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QtContentAssistantTests.java +++ b/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QtContentAssistantTests.java @@ -10,8 +10,6 @@ */ package org.eclipse.cdt.qt.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ITranslationUnit; @@ -23,6 +21,8 @@ import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.ITextViewer; import org.eclipse.ui.IEditorPart; +import junit.framework.TestCase; + public class QtContentAssistantTests extends TestCase { public void testQPropertyProposals() throws Exception { diff --git a/testsrunner/org.eclipse.cdt.testsrunner.boost/src/org/eclipse/cdt/testsrunner/internal/boost/BoostXmlLogHandler.java b/testsrunner/org.eclipse.cdt.testsrunner.boost/src/org/eclipse/cdt/testsrunner/internal/boost/BoostXmlLogHandler.java index a4bc3708025..19f034d968f 100644 --- a/testsrunner/org.eclipse.cdt.testsrunner.boost/src/org/eclipse/cdt/testsrunner/internal/boost/BoostXmlLogHandler.java +++ b/testsrunner/org.eclipse.cdt.testsrunner.boost/src/org/eclipse/cdt/testsrunner/internal/boost/BoostXmlLogHandler.java @@ -20,10 +20,10 @@ import java.util.HashMap; import java.util.Map; import java.util.Stack; -import org.eclipse.cdt.testsrunner.model.ITestModelUpdater; import org.eclipse.cdt.testsrunner.model.ITestItem; -import org.eclipse.cdt.testsrunner.model.ITestMessage; import org.eclipse.cdt.testsrunner.model.ITestItem.Status; +import org.eclipse.cdt.testsrunner.model.ITestMessage; +import org.eclipse.cdt.testsrunner.model.ITestModelUpdater; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; diff --git a/testsrunner/org.eclipse.cdt.testsrunner.gtest/src/org/eclipse/cdt/testsrunner/internal/gtest/OutputHandler.java b/testsrunner/org.eclipse.cdt.testsrunner.gtest/src/org/eclipse/cdt/testsrunner/internal/gtest/OutputHandler.java index e1b690fb40b..67cc732216d 100644 --- a/testsrunner/org.eclipse.cdt.testsrunner.gtest/src/org/eclipse/cdt/testsrunner/internal/gtest/OutputHandler.java +++ b/testsrunner/org.eclipse.cdt.testsrunner.gtest/src/org/eclipse/cdt/testsrunner/internal/gtest/OutputHandler.java @@ -23,9 +23,9 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.eclipse.cdt.testsrunner.model.ITestModelUpdater; import org.eclipse.cdt.testsrunner.model.ITestItem; import org.eclipse.cdt.testsrunner.model.ITestMessage; +import org.eclipse.cdt.testsrunner.model.ITestModelUpdater; import org.eclipse.cdt.testsrunner.model.TestingException; import org.xml.sax.SAXException; diff --git a/testsrunner/org.eclipse.cdt.testsrunner.qttest/src/org/eclipse/cdt/testsrunner/internal/qttest/QtXmlLogHandler.java b/testsrunner/org.eclipse.cdt.testsrunner.qttest/src/org/eclipse/cdt/testsrunner/internal/qttest/QtXmlLogHandler.java index 2f674f369c6..76a9ce7dfe8 100644 --- a/testsrunner/org.eclipse.cdt.testsrunner.qttest/src/org/eclipse/cdt/testsrunner/internal/qttest/QtXmlLogHandler.java +++ b/testsrunner/org.eclipse.cdt.testsrunner.qttest/src/org/eclipse/cdt/testsrunner/internal/qttest/QtXmlLogHandler.java @@ -18,11 +18,11 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; +import org.eclipse.cdt.testsrunner.model.ITestCase; import org.eclipse.cdt.testsrunner.model.ITestItem; +import org.eclipse.cdt.testsrunner.model.ITestMessage; import org.eclipse.cdt.testsrunner.model.ITestMessage.Level; import org.eclipse.cdt.testsrunner.model.ITestModelUpdater; -import org.eclipse.cdt.testsrunner.model.ITestCase; -import org.eclipse.cdt.testsrunner.model.ITestMessage; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; diff --git a/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/core/TestModelManagerBaseReorderingTestCase.java b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/core/TestModelManagerBaseReorderingTestCase.java index 580c8819f9f..7e3c46915e5 100644 --- a/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/core/TestModelManagerBaseReorderingTestCase.java +++ b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/core/TestModelManagerBaseReorderingTestCase.java @@ -16,12 +16,12 @@ package org.eclipse.cdt.testsrunner.core; import java.util.ArrayList; import java.util.List; -import junit.framework.TestCase; - import org.eclipse.cdt.testsrunner.internal.model.TestModelManager; import org.eclipse.cdt.testsrunner.model.ITestItem; import org.eclipse.cdt.testsrunner.model.ITestSuite; +import junit.framework.TestCase; + /** * Base test case for test suites & test cases reordering in TestModelManager. */ diff --git a/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/test/AutomatedIntegrationSuite.java b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/test/AutomatedIntegrationSuite.java index 925a6c2aeab..3db20e769e5 100644 --- a/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/test/AutomatedIntegrationSuite.java +++ b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/test/AutomatedIntegrationSuite.java @@ -13,16 +13,16 @@ *******************************************************************************/ package org.eclipse.cdt.testsrunner.test; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.cdt.testsrunner.core.TestModelManagerCasesReorderingTestCase; import org.eclipse.cdt.testsrunner.core.TestModelManagerSuitesReorderingTestCase; import org.eclipse.cdt.testsrunner.testsrunners.BoostTestCase; import org.eclipse.cdt.testsrunner.testsrunners.GoogleTestCase; import org.eclipse.cdt.testsrunner.testsrunners.QtTestCase; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * Test suite with all the tests on Tests Runner. */ diff --git a/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/BaseTestCase.java b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/BaseTestCase.java index f09be3b7d5d..8869e7d831f 100644 --- a/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/BaseTestCase.java +++ b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/BaseTestCase.java @@ -18,14 +18,14 @@ import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; -import junit.framework.TestCase; - import org.eclipse.cdt.core.testplugin.util.TestSourceReader; import org.eclipse.cdt.testsrunner.launcher.ITestsRunnerProvider; import org.eclipse.cdt.testsrunner.model.TestingException; import org.eclipse.cdt.testsrunner.test.TestsRunnerTestActivator; import org.eclipse.core.runtime.Plugin; +import junit.framework.TestCase; + /** * Base test case for Tests Runner provider plug-ins testing. */ diff --git a/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/MockTestModelUpdater.java b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/MockTestModelUpdater.java index 0507f8fc1eb..188f1c593b3 100644 --- a/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/MockTestModelUpdater.java +++ b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/MockTestModelUpdater.java @@ -17,8 +17,6 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.Set; -import junit.framework.Assert; - import org.eclipse.cdt.testsrunner.model.IModelVisitor; import org.eclipse.cdt.testsrunner.model.ITestCase; import org.eclipse.cdt.testsrunner.model.ITestItem; @@ -28,6 +26,8 @@ import org.eclipse.cdt.testsrunner.model.ITestMessage.Level; import org.eclipse.cdt.testsrunner.model.ITestModelUpdater; import org.eclipse.cdt.testsrunner.model.ITestSuite; +import junit.framework.Assert; + /** * Mock for the {@see ITestModelUpdater}. */ diff --git a/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/model/TestModelManager.java b/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/model/TestModelManager.java index 2b4ef8caae7..998fe870b00 100644 --- a/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/model/TestModelManager.java +++ b/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/model/TestModelManager.java @@ -22,15 +22,15 @@ import java.util.Map; import java.util.Stack; import org.eclipse.cdt.testsrunner.model.IModelVisitor; -import org.eclipse.cdt.testsrunner.model.ITestMessage; -import org.eclipse.cdt.testsrunner.model.ITestModelAccessor; -import org.eclipse.cdt.testsrunner.model.ITestModelUpdater; -import org.eclipse.cdt.testsrunner.model.ITestingSessionListener; import org.eclipse.cdt.testsrunner.model.ITestCase; import org.eclipse.cdt.testsrunner.model.ITestItem; import org.eclipse.cdt.testsrunner.model.ITestItem.Status; +import org.eclipse.cdt.testsrunner.model.ITestMessage; import org.eclipse.cdt.testsrunner.model.ITestMessage.Level; +import org.eclipse.cdt.testsrunner.model.ITestModelAccessor; +import org.eclipse.cdt.testsrunner.model.ITestModelUpdater; import org.eclipse.cdt.testsrunner.model.ITestSuite; +import org.eclipse.cdt.testsrunner.model.ITestingSessionListener; /** * Manages the testing model (creates, fill and update it) and notifies the diff --git a/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/ui/view/CounterPanel.java b/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/ui/view/CounterPanel.java index f4e69b5a685..ee73686e0e4 100644 --- a/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/ui/view/CounterPanel.java +++ b/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/ui/view/CounterPanel.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.cdt.testsrunner.internal.ui.view; +import java.text.MessageFormat; + import org.eclipse.cdt.testsrunner.internal.TestsRunnerPlugin; import org.eclipse.cdt.testsrunner.model.ITestItem; import org.eclipse.cdt.testsrunner.model.ITestingSession; @@ -22,7 +24,6 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; -import java.text.MessageFormat; /** * Shows a simple tests count statics information (run/error/failed). diff --git a/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/ui/view/UIUpdater.java b/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/ui/view/UIUpdater.java index 6c76e7cc4c6..3a83152d162 100644 --- a/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/ui/view/UIUpdater.java +++ b/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/ui/view/UIUpdater.java @@ -21,11 +21,11 @@ import java.util.Set; import org.eclipse.cdt.testsrunner.internal.model.ITestingSessionsManagerListener; import org.eclipse.cdt.testsrunner.internal.model.TestingSessionsManager; +import org.eclipse.cdt.testsrunner.model.ITestCase; import org.eclipse.cdt.testsrunner.model.ITestItem; +import org.eclipse.cdt.testsrunner.model.ITestSuite; import org.eclipse.cdt.testsrunner.model.ITestingSession; import org.eclipse.cdt.testsrunner.model.ITestingSessionListener; -import org.eclipse.cdt.testsrunner.model.ITestCase; -import org.eclipse.cdt.testsrunner.model.ITestSuite; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; diff --git a/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/ui/view/actions/OpenInEditorAction.java b/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/ui/view/actions/OpenInEditorAction.java index f522fedb958..9e9ddbb19c0 100644 --- a/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/ui/view/actions/OpenInEditorAction.java +++ b/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/ui/view/actions/OpenInEditorAction.java @@ -15,18 +15,18 @@ package org.eclipse.cdt.testsrunner.internal.ui.view.actions; import java.net.URI; -import org.eclipse.cdt.debug.ui.CDebugUIPlugin; import org.eclipse.cdt.debug.core.CDebugCorePlugin; +import org.eclipse.cdt.debug.ui.CDebugUIPlugin; import org.eclipse.cdt.testsrunner.internal.TestsRunnerPlugin; import org.eclipse.cdt.testsrunner.internal.model.TestingSessionsManager; import org.eclipse.cdt.testsrunner.model.ITestLocation; import org.eclipse.cdt.testsrunner.model.ITestMessage; +import org.eclipse.core.filesystem.URIUtil; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; -import org.eclipse.core.filesystem.URIUtil; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.ILaunchConfiguration; @@ -39,11 +39,11 @@ import org.eclipse.debug.ui.DebugUITools; import org.eclipse.debug.ui.IDebugModelPresentation; import org.eclipse.debug.ui.sourcelookup.ISourceLookupResult; import org.eclipse.jface.action.Action; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.TableViewer; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbench; diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCLanguageExtensionTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCLanguageExtensionTests.java index 160ef04d51f..23a8757095d 100644 --- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCLanguageExtensionTests.java +++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCLanguageExtensionTests.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.upc.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.dom.ast.IASTArrayDeclarator; import org.eclipse.cdt.core.dom.ast.IASTArrayModifier; import org.eclipse.cdt.core.dom.ast.IASTArraySubscriptExpression; @@ -47,6 +45,8 @@ import org.eclipse.cdt.core.dom.upc.ast.IUPCASTTypeIdSizeofExpression; import org.eclipse.cdt.core.dom.upc.ast.IUPCASTUnarySizeofExpression; import org.eclipse.cdt.core.lrparser.tests.ParseHelper; +import junit.framework.TestCase; + @SuppressWarnings("nls") public class UPCLanguageExtensionTests extends TestCase { diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCTests.java index 9404f78363d..0921699f043 100644 --- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCTests.java +++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCTests.java @@ -13,12 +13,12 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.upc.tests; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.dom.upc.UPCLanguage; import org.eclipse.cdt.core.lrparser.tests.LRTests; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestSuite; + /** * Run the C99 tests against the UPC parser * diff --git a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/core/dom/parser/upc/DOMToUPCTokenMap.java b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/core/dom/parser/upc/DOMToUPCTokenMap.java index 096afa69e7b..c84ca241dc9 100644 --- a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/core/dom/parser/upc/DOMToUPCTokenMap.java +++ b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/core/dom/parser/upc/DOMToUPCTokenMap.java @@ -13,8 +13,196 @@ *******************************************************************************/ package org.eclipse.cdt.core.dom.parser.upc; -import static org.eclipse.cdt.core.parser.IToken.*; -import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.*; +import static org.eclipse.cdt.core.parser.IToken.tAMPER; +import static org.eclipse.cdt.core.parser.IToken.tAMPERASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tAND; +import static org.eclipse.cdt.core.parser.IToken.tARROW; +import static org.eclipse.cdt.core.parser.IToken.tASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tBITCOMPLEMENT; +import static org.eclipse.cdt.core.parser.IToken.tBITOR; +import static org.eclipse.cdt.core.parser.IToken.tBITORASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tCHAR; +import static org.eclipse.cdt.core.parser.IToken.tCOLON; +import static org.eclipse.cdt.core.parser.IToken.tCOMMA; +import static org.eclipse.cdt.core.parser.IToken.tCOMPLETION; +import static org.eclipse.cdt.core.parser.IToken.tDECR; +import static org.eclipse.cdt.core.parser.IToken.tDIV; +import static org.eclipse.cdt.core.parser.IToken.tDIVASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tDOT; +import static org.eclipse.cdt.core.parser.IToken.tELLIPSIS; +import static org.eclipse.cdt.core.parser.IToken.tEND_OF_INPUT; +import static org.eclipse.cdt.core.parser.IToken.tEOC; +import static org.eclipse.cdt.core.parser.IToken.tEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tFLOATINGPT; +import static org.eclipse.cdt.core.parser.IToken.tGT; +import static org.eclipse.cdt.core.parser.IToken.tGTEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tIDENTIFIER; +import static org.eclipse.cdt.core.parser.IToken.tINCR; +import static org.eclipse.cdt.core.parser.IToken.tINTEGER; +import static org.eclipse.cdt.core.parser.IToken.tLBRACE; +import static org.eclipse.cdt.core.parser.IToken.tLBRACKET; +import static org.eclipse.cdt.core.parser.IToken.tLCHAR; +import static org.eclipse.cdt.core.parser.IToken.tLPAREN; +import static org.eclipse.cdt.core.parser.IToken.tLSTRING; +import static org.eclipse.cdt.core.parser.IToken.tLT; +import static org.eclipse.cdt.core.parser.IToken.tLTEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tMINUS; +import static org.eclipse.cdt.core.parser.IToken.tMINUSASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tMOD; +import static org.eclipse.cdt.core.parser.IToken.tMODASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tNOT; +import static org.eclipse.cdt.core.parser.IToken.tNOTEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tOR; +import static org.eclipse.cdt.core.parser.IToken.tPLUS; +import static org.eclipse.cdt.core.parser.IToken.tPLUSASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tQUESTION; +import static org.eclipse.cdt.core.parser.IToken.tRBRACE; +import static org.eclipse.cdt.core.parser.IToken.tRBRACKET; +import static org.eclipse.cdt.core.parser.IToken.tRPAREN; +import static org.eclipse.cdt.core.parser.IToken.tSEMI; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTL; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTLASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTR; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTRASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tSTAR; +import static org.eclipse.cdt.core.parser.IToken.tSTARASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tSTRING; +import static org.eclipse.cdt.core.parser.IToken.tUNKNOWN_CHAR; +import static org.eclipse.cdt.core.parser.IToken.tUTF16CHAR; +import static org.eclipse.cdt.core.parser.IToken.tUTF16STRING; +import static org.eclipse.cdt.core.parser.IToken.tUTF32CHAR; +import static org.eclipse.cdt.core.parser.IToken.tUTF32STRING; +import static org.eclipse.cdt.core.parser.IToken.tXOR; +import static org.eclipse.cdt.core.parser.IToken.tXORASSIGN; +import static org.eclipse.cdt.core.parser.IToken.t__Bool; +import static org.eclipse.cdt.core.parser.IToken.t__Complex; +import static org.eclipse.cdt.core.parser.IToken.t__Imaginary; +import static org.eclipse.cdt.core.parser.IToken.t_auto; +import static org.eclipse.cdt.core.parser.IToken.t_break; +import static org.eclipse.cdt.core.parser.IToken.t_case; +import static org.eclipse.cdt.core.parser.IToken.t_char; +import static org.eclipse.cdt.core.parser.IToken.t_const; +import static org.eclipse.cdt.core.parser.IToken.t_continue; +import static org.eclipse.cdt.core.parser.IToken.t_default; +import static org.eclipse.cdt.core.parser.IToken.t_do; +import static org.eclipse.cdt.core.parser.IToken.t_double; +import static org.eclipse.cdt.core.parser.IToken.t_else; +import static org.eclipse.cdt.core.parser.IToken.t_enum; +import static org.eclipse.cdt.core.parser.IToken.t_extern; +import static org.eclipse.cdt.core.parser.IToken.t_float; +import static org.eclipse.cdt.core.parser.IToken.t_for; +import static org.eclipse.cdt.core.parser.IToken.t_goto; +import static org.eclipse.cdt.core.parser.IToken.t_if; +import static org.eclipse.cdt.core.parser.IToken.t_inline; +import static org.eclipse.cdt.core.parser.IToken.t_int; +import static org.eclipse.cdt.core.parser.IToken.t_long; +import static org.eclipse.cdt.core.parser.IToken.t_register; +import static org.eclipse.cdt.core.parser.IToken.t_restrict; +import static org.eclipse.cdt.core.parser.IToken.t_return; +import static org.eclipse.cdt.core.parser.IToken.t_short; +import static org.eclipse.cdt.core.parser.IToken.t_signed; +import static org.eclipse.cdt.core.parser.IToken.t_sizeof; +import static org.eclipse.cdt.core.parser.IToken.t_static; +import static org.eclipse.cdt.core.parser.IToken.t_struct; +import static org.eclipse.cdt.core.parser.IToken.t_switch; +import static org.eclipse.cdt.core.parser.IToken.t_typedef; +import static org.eclipse.cdt.core.parser.IToken.t_union; +import static org.eclipse.cdt.core.parser.IToken.t_unsigned; +import static org.eclipse.cdt.core.parser.IToken.t_void; +import static org.eclipse.cdt.core.parser.IToken.t_volatile; +import static org.eclipse.cdt.core.parser.IToken.t_while; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_And; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_AndAnd; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_AndAssign; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Arrow; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Assign; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Bang; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Caret; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_CaretAssign; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Colon; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Comma; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Completion; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Dot; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_DotDotDot; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_EOF_TOKEN; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_EQ; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_EndOfCompletion; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_GE; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_GT; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Invalid; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_LE; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_LT; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_LeftBrace; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_LeftBracket; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_LeftParen; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_LeftShift; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_LeftShiftAssign; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Minus; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_MinusAssign; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_MinusMinus; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_NE; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Or; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_OrAssign; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_OrOr; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Percent; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_PercentAssign; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Plus; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_PlusAssign; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_PlusPlus; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Question; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_RightBrace; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_RightBracket; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_RightParen; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_RightShift; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_RightShiftAssign; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_SemiColon; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Slash; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_SlashAssign; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Star; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_StarAssign; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Tilde; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK__Bool; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK__Complex; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK__Imaginary; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_auto; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_break; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_case; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_char; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_charconst; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_const; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_continue; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_default; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_do; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_double; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_else; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_enum; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_extern; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_float; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_floating; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_for; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_goto; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_identifier; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_if; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_inline; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_int; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_integer; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_long; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_register; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_restrict; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_return; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_short; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_signed; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_sizeof; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_static; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_stringlit; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_struct; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_switch; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_typedef; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_union; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_unsigned; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_void; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_volatile; +import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_while; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.parser.IToken; diff --git a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/core/dom/parser/upc/UPCParserAction.java b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/core/dom/parser/upc/UPCParserAction.java index 206b842400c..74b3f8dbfae 100644 --- a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/core/dom/parser/upc/UPCParserAction.java +++ b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/core/dom/parser/upc/UPCParserAction.java @@ -17,7 +17,6 @@ import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_Compl import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_relaxed; import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_shared; import static org.eclipse.cdt.internal.core.dom.parser.upc.UPCParsersym.TK_strict; -import lpg.lpgjavaruntime.IToken; import org.eclipse.cdt.core.dom.ast.IASTDeclaration; import org.eclipse.cdt.core.dom.ast.IASTExpression; @@ -25,8 +24,8 @@ import org.eclipse.cdt.core.dom.ast.IASTStatement; import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression; import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; import org.eclipse.cdt.core.dom.ast.c.ICASTDeclSpecifier; -import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; import org.eclipse.cdt.core.dom.lrparser.action.ISecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; import org.eclipse.cdt.core.dom.lrparser.action.c99.C99BuildASTParserAction; import org.eclipse.cdt.core.dom.upc.ast.IUPCASTDeclSpecifier; @@ -34,6 +33,8 @@ import org.eclipse.cdt.core.dom.upc.ast.IUPCASTForallStatement; import org.eclipse.cdt.core.dom.upc.ast.IUPCASTKeywordExpression; import org.eclipse.cdt.core.dom.upc.ast.IUPCASTSynchronizationStatement; +import lpg.lpgjavaruntime.IToken; + /** * Extension to the C99ParserAction that adds support fot building * an AST with UPC specific nodes. diff --git a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCExpressionParser.java b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCExpressionParser.java index 2737b9a6b62..ca37ad62c5c 100644 --- a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCExpressionParser.java +++ b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCExpressionParser.java @@ -19,24 +19,6 @@ package org.eclipse.cdt.internal.core.dom.parser.upc; import java.util.List; import java.util.Map; -import lpg.lpgjavaruntime.BadParseException; -import lpg.lpgjavaruntime.BadParseSymFileException; -import lpg.lpgjavaruntime.DiagnoseParser; -import lpg.lpgjavaruntime.ErrorToken; -import lpg.lpgjavaruntime.IToken; -import lpg.lpgjavaruntime.LexStream; -import lpg.lpgjavaruntime.Monitor; -import lpg.lpgjavaruntime.NotBacktrackParseTableException; -import lpg.lpgjavaruntime.NullExportedSymbolsException; -import lpg.lpgjavaruntime.NullTerminalSymbolsException; -import lpg.lpgjavaruntime.ParseErrorCodes; -import lpg.lpgjavaruntime.ParseTable; -import lpg.lpgjavaruntime.PrsStream; -import lpg.lpgjavaruntime.RuleAction; -import lpg.lpgjavaruntime.Token; -import lpg.lpgjavaruntime.UndefinedEofSymbolException; -import lpg.lpgjavaruntime.UnimplementedTerminalsException; - import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; import org.eclipse.cdt.core.dom.ast.IASTCastExpression; import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; @@ -66,6 +48,24 @@ import org.eclipse.cdt.core.dom.upc.ast.IUPCASTUnarySizeofExpression; import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.parser.IScanner; +import lpg.lpgjavaruntime.BadParseException; +import lpg.lpgjavaruntime.BadParseSymFileException; +import lpg.lpgjavaruntime.DiagnoseParser; +import lpg.lpgjavaruntime.ErrorToken; +import lpg.lpgjavaruntime.IToken; +import lpg.lpgjavaruntime.LexStream; +import lpg.lpgjavaruntime.Monitor; +import lpg.lpgjavaruntime.NotBacktrackParseTableException; +import lpg.lpgjavaruntime.NullExportedSymbolsException; +import lpg.lpgjavaruntime.NullTerminalSymbolsException; +import lpg.lpgjavaruntime.ParseErrorCodes; +import lpg.lpgjavaruntime.ParseTable; +import lpg.lpgjavaruntime.PrsStream; +import lpg.lpgjavaruntime.RuleAction; +import lpg.lpgjavaruntime.Token; +import lpg.lpgjavaruntime.UndefinedEofSymbolException; +import lpg.lpgjavaruntime.UnimplementedTerminalsException; + public class UPCExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTExpression>, ISecondaryParser<IASTExpression> { private static ParseTable prs = new UPCExpressionParserprs(); diff --git a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCNoCastExpressionParser.java b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCNoCastExpressionParser.java index 56026015e78..ade5075117e 100644 --- a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCNoCastExpressionParser.java +++ b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCNoCastExpressionParser.java @@ -19,24 +19,6 @@ package org.eclipse.cdt.internal.core.dom.parser.upc; import java.util.List; import java.util.Map; -import lpg.lpgjavaruntime.BadParseException; -import lpg.lpgjavaruntime.BadParseSymFileException; -import lpg.lpgjavaruntime.DiagnoseParser; -import lpg.lpgjavaruntime.ErrorToken; -import lpg.lpgjavaruntime.IToken; -import lpg.lpgjavaruntime.LexStream; -import lpg.lpgjavaruntime.Monitor; -import lpg.lpgjavaruntime.NotBacktrackParseTableException; -import lpg.lpgjavaruntime.NullExportedSymbolsException; -import lpg.lpgjavaruntime.NullTerminalSymbolsException; -import lpg.lpgjavaruntime.ParseErrorCodes; -import lpg.lpgjavaruntime.ParseTable; -import lpg.lpgjavaruntime.PrsStream; -import lpg.lpgjavaruntime.RuleAction; -import lpg.lpgjavaruntime.Token; -import lpg.lpgjavaruntime.UndefinedEofSymbolException; -import lpg.lpgjavaruntime.UnimplementedTerminalsException; - import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; @@ -65,6 +47,24 @@ import org.eclipse.cdt.core.dom.upc.ast.IUPCASTUnarySizeofExpression; import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.parser.IScanner; +import lpg.lpgjavaruntime.BadParseException; +import lpg.lpgjavaruntime.BadParseSymFileException; +import lpg.lpgjavaruntime.DiagnoseParser; +import lpg.lpgjavaruntime.ErrorToken; +import lpg.lpgjavaruntime.IToken; +import lpg.lpgjavaruntime.LexStream; +import lpg.lpgjavaruntime.Monitor; +import lpg.lpgjavaruntime.NotBacktrackParseTableException; +import lpg.lpgjavaruntime.NullExportedSymbolsException; +import lpg.lpgjavaruntime.NullTerminalSymbolsException; +import lpg.lpgjavaruntime.ParseErrorCodes; +import lpg.lpgjavaruntime.ParseTable; +import lpg.lpgjavaruntime.PrsStream; +import lpg.lpgjavaruntime.RuleAction; +import lpg.lpgjavaruntime.Token; +import lpg.lpgjavaruntime.UndefinedEofSymbolException; +import lpg.lpgjavaruntime.UnimplementedTerminalsException; + public class UPCNoCastExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTExpression>, ISecondaryParser<IASTExpression> { private static ParseTable prs = new UPCNoCastExpressionParserprs(); diff --git a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCParser.java b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCParser.java index 6dc2a134ed0..694f1e0fff0 100644 --- a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCParser.java +++ b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCParser.java @@ -19,23 +19,6 @@ package org.eclipse.cdt.internal.core.dom.parser.upc; import java.util.List; import java.util.Map; -import lpg.lpgjavaruntime.BadParseException; -import lpg.lpgjavaruntime.BadParseSymFileException; -import lpg.lpgjavaruntime.DiagnoseParser; -import lpg.lpgjavaruntime.ErrorToken; -import lpg.lpgjavaruntime.IToken; -import lpg.lpgjavaruntime.LexStream; -import lpg.lpgjavaruntime.Monitor; -import lpg.lpgjavaruntime.NotBacktrackParseTableException; -import lpg.lpgjavaruntime.NullExportedSymbolsException; -import lpg.lpgjavaruntime.NullTerminalSymbolsException; -import lpg.lpgjavaruntime.ParseErrorCodes; -import lpg.lpgjavaruntime.ParseTable; -import lpg.lpgjavaruntime.PrsStream; -import lpg.lpgjavaruntime.RuleAction; -import lpg.lpgjavaruntime.UndefinedEofSymbolException; -import lpg.lpgjavaruntime.UnimplementedTerminalsException; - import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; import org.eclipse.cdt.core.dom.ast.IASTCastExpression; import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; @@ -62,6 +45,23 @@ import org.eclipse.cdt.core.dom.upc.ast.IUPCASTUnarySizeofExpression; import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.parser.IScanner; +import lpg.lpgjavaruntime.BadParseException; +import lpg.lpgjavaruntime.BadParseSymFileException; +import lpg.lpgjavaruntime.DiagnoseParser; +import lpg.lpgjavaruntime.ErrorToken; +import lpg.lpgjavaruntime.IToken; +import lpg.lpgjavaruntime.LexStream; +import lpg.lpgjavaruntime.Monitor; +import lpg.lpgjavaruntime.NotBacktrackParseTableException; +import lpg.lpgjavaruntime.NullExportedSymbolsException; +import lpg.lpgjavaruntime.NullTerminalSymbolsException; +import lpg.lpgjavaruntime.ParseErrorCodes; +import lpg.lpgjavaruntime.ParseTable; +import lpg.lpgjavaruntime.PrsStream; +import lpg.lpgjavaruntime.RuleAction; +import lpg.lpgjavaruntime.UndefinedEofSymbolException; +import lpg.lpgjavaruntime.UnimplementedTerminalsException; + public class UPCParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTTranslationUnit> diff --git a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCSizeofExpressionParser.java b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCSizeofExpressionParser.java index 499987b63ab..7e90b77d25d 100644 --- a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCSizeofExpressionParser.java +++ b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/internal/core/dom/parser/upc/UPCSizeofExpressionParser.java @@ -19,24 +19,6 @@ package org.eclipse.cdt.internal.core.dom.parser.upc; import java.util.List; import java.util.Map; -import lpg.lpgjavaruntime.BadParseException; -import lpg.lpgjavaruntime.BadParseSymFileException; -import lpg.lpgjavaruntime.DiagnoseParser; -import lpg.lpgjavaruntime.ErrorToken; -import lpg.lpgjavaruntime.IToken; -import lpg.lpgjavaruntime.LexStream; -import lpg.lpgjavaruntime.Monitor; -import lpg.lpgjavaruntime.NotBacktrackParseTableException; -import lpg.lpgjavaruntime.NullExportedSymbolsException; -import lpg.lpgjavaruntime.NullTerminalSymbolsException; -import lpg.lpgjavaruntime.ParseErrorCodes; -import lpg.lpgjavaruntime.ParseTable; -import lpg.lpgjavaruntime.PrsStream; -import lpg.lpgjavaruntime.RuleAction; -import lpg.lpgjavaruntime.Token; -import lpg.lpgjavaruntime.UndefinedEofSymbolException; -import lpg.lpgjavaruntime.UnimplementedTerminalsException; - import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; import org.eclipse.cdt.core.dom.ast.IASTCastExpression; import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; @@ -65,6 +47,24 @@ import org.eclipse.cdt.core.dom.upc.ast.IUPCASTUnarySizeofExpression; import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.parser.IScanner; +import lpg.lpgjavaruntime.BadParseException; +import lpg.lpgjavaruntime.BadParseSymFileException; +import lpg.lpgjavaruntime.DiagnoseParser; +import lpg.lpgjavaruntime.ErrorToken; +import lpg.lpgjavaruntime.IToken; +import lpg.lpgjavaruntime.LexStream; +import lpg.lpgjavaruntime.Monitor; +import lpg.lpgjavaruntime.NotBacktrackParseTableException; +import lpg.lpgjavaruntime.NullExportedSymbolsException; +import lpg.lpgjavaruntime.NullTerminalSymbolsException; +import lpg.lpgjavaruntime.ParseErrorCodes; +import lpg.lpgjavaruntime.ParseTable; +import lpg.lpgjavaruntime.PrsStream; +import lpg.lpgjavaruntime.RuleAction; +import lpg.lpgjavaruntime.Token; +import lpg.lpgjavaruntime.UndefinedEofSymbolException; +import lpg.lpgjavaruntime.UnimplementedTerminalsException; + public class UPCSizeofExpressionParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTExpression>, ISecondaryParser<IASTExpression> { private static ParseTable prs = new UPCSizeofExpressionParserprs(); diff --git a/upc/org.eclipse.cdt.managedbuilder.bupc.ui/src/org/eclipse/cdt/managedbuilder/bupc/ui/UPCWizardsPlugin.java b/upc/org.eclipse.cdt.managedbuilder.bupc.ui/src/org/eclipse/cdt/managedbuilder/bupc/ui/UPCWizardsPlugin.java index ee7e4104900..0a4ef649362 100644 --- a/upc/org.eclipse.cdt.managedbuilder.bupc.ui/src/org/eclipse/cdt/managedbuilder/bupc/ui/UPCWizardsPlugin.java +++ b/upc/org.eclipse.cdt.managedbuilder.bupc.ui/src/org/eclipse/cdt/managedbuilder/bupc/ui/UPCWizardsPlugin.java @@ -14,10 +14,12 @@ ****************************************************************************/ package org.eclipse.cdt.managedbuilder.bupc.ui; -import org.eclipse.ui.plugin.*; +import java.util.MissingResourceException; +import java.util.ResourceBundle; + import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; -import java.util.*; /** * Based on plugin class for PLDT Wizards (MPI & OpenMP) diff --git a/visualizer/org.eclipse.cdt.visualizer.examples/src/org/eclipse/cdt/visualizer/examples/sourcegraph/SourceGraphVisualizer.java b/visualizer/org.eclipse.cdt.visualizer.examples/src/org/eclipse/cdt/visualizer/examples/sourcegraph/SourceGraphVisualizer.java index ec2cb9173af..8139e5f76e0 100644 --- a/visualizer/org.eclipse.cdt.visualizer.examples/src/org/eclipse/cdt/visualizer/examples/sourcegraph/SourceGraphVisualizer.java +++ b/visualizer/org.eclipse.cdt.visualizer.examples/src/org/eclipse/cdt/visualizer/examples/sourcegraph/SourceGraphVisualizer.java @@ -23,8 +23,8 @@ import org.eclipse.cdt.visualizer.ui.util.SelectionManager; import org.eclipse.cdt.visualizer.ui.util.SelectionUtils; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IToolBarManager; -import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.text.TextSelection; +import org.eclipse.jface.viewers.ISelection; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/VisualizerView.java b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/VisualizerView.java index 61a62ae251f..fe84287e3f1 100644 --- a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/VisualizerView.java +++ b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/VisualizerView.java @@ -20,6 +20,14 @@ package org.eclipse.cdt.visualizer.ui; // Java classes import java.util.List; +import org.eclipse.cdt.debug.internal.ui.actions.OpenNewViewAction; +import org.eclipse.cdt.debug.internal.ui.pinclone.PinCloneUtils; +// Custom classes +import org.eclipse.cdt.visualizer.ui.events.IVisualizerViewerListener; +import org.eclipse.cdt.visualizer.ui.events.VisualizerViewerEvent; +import org.eclipse.cdt.visualizer.ui.util.SelectionProviderAdapter; +import org.eclipse.cdt.visualizer.ui.util.SelectionUtils; +import org.eclipse.cdt.visualizer.ui.util.WorkbenchSelectionAdapter; // SWT/JFace classes import org.eclipse.jface.action.IMenuListener2; import org.eclipse.jface.action.IMenuManager; @@ -32,18 +40,8 @@ import org.eclipse.swt.graphics.Point; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Menu; import org.eclipse.ui.IActionBars; - // Eclipse/CDT classes import org.eclipse.ui.part.ViewPart; -import org.eclipse.cdt.debug.internal.ui.actions.OpenNewViewAction; -import org.eclipse.cdt.debug.internal.ui.pinclone.PinCloneUtils; - -// Custom classes -import org.eclipse.cdt.visualizer.ui.events.IVisualizerViewerListener; -import org.eclipse.cdt.visualizer.ui.events.VisualizerViewerEvent; -import org.eclipse.cdt.visualizer.ui.util.SelectionProviderAdapter; -import org.eclipse.cdt.visualizer.ui.util.SelectionUtils; -import org.eclipse.cdt.visualizer.ui.util.WorkbenchSelectionAdapter; // ---------------------------------------------------------------------------- // VisualizerView diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/test/TestCanvasVisualizer.java b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/test/TestCanvasVisualizer.java index ec735c87982..2a0a5aa2fd1 100644 --- a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/test/TestCanvasVisualizer.java +++ b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/test/TestCanvasVisualizer.java @@ -14,13 +14,12 @@ package org.eclipse.cdt.visualizer.ui.test; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Composite; - import org.eclipse.cdt.visualizer.ui.canvas.GraphicCanvas; import org.eclipse.cdt.visualizer.ui.canvas.GraphicCanvasVisualizer; import org.eclipse.cdt.visualizer.ui.util.SelectionUtils; import org.eclipse.jface.viewers.ISelection; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Composite; // --------------------------------------------------------------------------- // TestCanvasVisualizer diff --git a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinScannerInfoCollector.java b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinScannerInfoCollector.java index 1f3271036ea..6829e4e7921 100644 --- a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinScannerInfoCollector.java +++ b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinScannerInfoCollector.java @@ -13,10 +13,10 @@ package org.eclipse.cdt.msw.build; import java.util.List; import java.util.Map; +import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredPathInfo; import org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector3; import org.eclipse.cdt.make.core.scannerconfig.InfoContext; import org.eclipse.cdt.make.core.scannerconfig.ScannerInfoTypes; -import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredPathInfo; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/XlcTestBase.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/XlcTestBase.java index c4d3cf3c419..64a4fca6ddc 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/XlcTestBase.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/XlcTestBase.java @@ -13,14 +13,14 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.lrparser.tests.ParseHelper; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestCase; + public class XlcTestBase extends TestCase { public XlcTestBase() { diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcCompletionHangingTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcCompletionHangingTest.java index fcabbf988a7..bb97050bbfa 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcCompletionHangingTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcCompletionHangingTest.java @@ -13,12 +13,12 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.lrparser.tests.LRCompletionHangingTest; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; +import junit.framework.TestSuite; + public class XlcCompletionHangingTest extends LRCompletionHangingTest { public static TestSuite suite() { diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPImplicitNameTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPImplicitNameTests.java index 2d6050baa6c..77913611368 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPImplicitNameTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPImplicitNameTests.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.lrparser.tests.LRCPPImplicitNameTests; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestSuite; + public class XlcLRCPPImplicitNameTests extends LRCPPImplicitNameTests { public static TestSuite suite() { return suite(XlcLRCPPImplicitNameTests.class); diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPSpecTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPSpecTest.java index 1900fca8e28..0d19effc016 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPSpecTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPSpecTest.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.lrparser.tests.LRCPPSpecTest; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestSuite; + public class XlcLRCPPSpecTest extends LRCPPSpecTest { public static TestSuite suite() { return suite(XlcLRCPPSpecTest.class); diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPTests.java index b76de18c521..3809dec9731 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPTests.java @@ -13,14 +13,14 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.lrparser.tests.LRCPPTests; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; +import junit.framework.TestSuite; + public class XlcLRCPPTests extends LRCPPTests { public static TestSuite suite() { return suite(XlcLRCPPTests.class); diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCSpecTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCSpecTests.java index 8607ef23f23..1f69df714bb 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCSpecTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCSpecTests.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.lrparser.tests.LRCSpecTests; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestSuite; + public class XlcLRCSpecTests extends LRCSpecTests { public static TestSuite suite() { return suite(XlcLRCSpecTests.class); diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCommentTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCommentTests.java index 172863181bf..934671cbff4 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCommentTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCommentTests.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.lrparser.tests.LRCommentTests; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestSuite; + public class XlcLRCommentTests extends LRCommentTests { public static TestSuite suite() { diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompleteParser2Tests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompleteParser2Tests.java index fbbda23e66a..92b9f6901a9 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompleteParser2Tests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompleteParser2Tests.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.lrparser.tests.LRCompleteParser2Tests; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestSuite; + public class XlcLRCompleteParser2Tests extends LRCompleteParser2Tests { public static TestSuite suite() { diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionBasicTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionBasicTest.java index 394a9baf277..35520a46219 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionBasicTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionBasicTest.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.lrparser.tests.LRCompletionBasicTest; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestSuite; + public class XlcLRCompletionBasicTest extends LRCompletionBasicTest { public static TestSuite suite() { return suite(XlcLRCompletionBasicTest.class); diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionParseTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionParseTest.java index fd5ed160751..24aee9daeb5 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionParseTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionParseTest.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.lrparser.tests.LRCompletionParseTest; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestSuite; + public class XlcLRCompletionParseTest extends LRCompletionParseTest { public static TestSuite suite() { return new TestSuite(XlcLRCompletionParseTest.class); diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationMacroTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationMacroTests.java index 8e2d936df6f..faca238b206 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationMacroTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationMacroTests.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.lrparser.tests.LRDOMLocationMacroTests; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestSuite; + public class XlcLRDOMLocationMacroTests extends LRDOMLocationMacroTests { public static TestSuite suite() { return suite(XlcLRDOMLocationMacroTests.class); diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationTests.java index b2108ca084a..f51f20fdd25 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationTests.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.lrparser.tests.LRDOMLocationTests; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestSuite; + public class XlcLRDOMLocationTests extends LRDOMLocationTests { public static TestSuite suite() { return suite(XlcLRDOMLocationTests.class); diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMPreprocessorInformationTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMPreprocessorInformationTest.java index d4b2a04abb6..558e8869e14 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMPreprocessorInformationTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMPreprocessorInformationTest.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.lrparser.tests.LRDOMPreprocessorInformationTest; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestSuite; + public class XlcLRDOMPreprocessorInformationTest extends LRDOMPreprocessorInformationTest { public static TestSuite suite() { return suite(XlcLRDOMPreprocessorInformationTest.class); diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDigraphTrigraphTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDigraphTrigraphTests.java index eaa4da889c3..5885f34dbd6 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDigraphTrigraphTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDigraphTrigraphTests.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.lrparser.tests.LRDigraphTrigraphTests; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestSuite; + public class XlcLRDigraphTrigraphTests extends LRDigraphTrigraphTests { public static TestSuite suite() { diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCCompleteParseExtensionsTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCCompleteParseExtensionsTest.java index 187580d9871..e28c164d39e 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCCompleteParseExtensionsTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCCompleteParseExtensionsTest.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.lrparser.tests.LRGCCCompleteParseExtensionsTest; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestSuite; + public class XlcLRGCCCompleteParseExtensionsTest extends LRGCCCompleteParseExtensionsTest { public static TestSuite suite() { return suite(XlcLRGCCCompleteParseExtensionsTest.class); diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCTests.java index 967aaa79114..9af5eee2f95 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCTests.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.lrparser.tests.LRGCCTests; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestSuite; + public class XlcLRGCCTests extends LRGCCTests { public static TestSuite suite() { return suite(XlcLRGCCTests.class); diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRImageLocationTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRImageLocationTests.java index 0e9c557d9ce..8d13d3dab8f 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRImageLocationTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRImageLocationTests.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.lrparser.tests.LRImageLocationTests; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestSuite; + public class XlcLRImageLocationTests extends LRImageLocationTests { public static TestSuite suite() { return suite(XlcLRImageLocationTests.class); diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRInactiveCodeTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRInactiveCodeTests.java index 342e7dc17c1..a39d7b9c8ae 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRInactiveCodeTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRInactiveCodeTests.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.lrparser.tests.LRInactiveCodeTests; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestSuite; + public class XlcLRInactiveCodeTests extends LRInactiveCodeTests { public static TestSuite suite() { return suite(XlcLRInactiveCodeTests.class); diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRKnRTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRKnRTests.java index d9a34967ffc..e054628c7f0 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRKnRTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRKnRTests.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.lrparser.tests.LRKnRTests; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestSuite; + public class XlcLRKnRTests extends LRKnRTests { public static TestSuite suite() { return suite(XlcLRKnRTests.class); diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRNodeSelectorTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRNodeSelectorTest.java index 54f859a83a4..d9af3c8d38b 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRNodeSelectorTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRNodeSelectorTest.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.lrparser.tests.LRNodeSelectorTest; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestSuite; + public class XlcLRNodeSelectorTest extends LRNodeSelectorTest { public static TestSuite suite() { return suite(XlcLRNodeSelectorTest.class); diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRQuickParser2Tests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRQuickParser2Tests.java index 860a2b43dc8..9dc5d5f89be 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRQuickParser2Tests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRQuickParser2Tests.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.lrparser.tests.LRQuickParser2Tests; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestSuite; + public class XlcLRQuickParser2Tests extends LRQuickParser2Tests { public static TestSuite suite() { return new TestSuite(XlcLRQuickParser2Tests.class); diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSelectionParseTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSelectionParseTest.java index 0fac0baf0b8..7963c6f8dae 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSelectionParseTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSelectionParseTest.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.lrparser.tests.LRSelectionParseTest; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestSuite; + public class XlcLRSelectionParseTest extends LRSelectionParseTest { public XlcLRSelectionParseTest() { diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSemanticsTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSemanticsTests.java index 8b59776a0cc..84ce6ddf89c 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSemanticsTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSemanticsTests.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.lrparser.tests.LRSemanticsTests; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestSuite; + public class XlcLRSemanticsTests extends LRSemanticsTests { public static TestSuite suite() { return suite(XlcLRSemanticsTests.class); diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTaskParserTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTaskParserTest.java index d2e602b5741..c4c3ccac1d6 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTaskParserTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTaskParserTest.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.lrparser.tests.LRTaskParserTest; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestSuite; + public class XlcLRTaskParserTest extends LRTaskParserTest { public static TestSuite suite() { return suite(XlcLRTaskParserTest.class); diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTemplateTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTemplateTests.java index fa2c1c18089..84acb881f70 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTemplateTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTemplateTests.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.lrparser.tests.LRTemplateTests; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestSuite; + public class XlcLRTemplateTests extends LRTemplateTests { public static TestSuite suite() { return suite(XlcLRTemplateTests.class); diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTests.java index 4eb9418e20f..c0ee1cef8c7 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTests.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.lrparser.tests.LRTests; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestSuite; + public class XlcLRTests extends LRTests { public XlcLRTests(String name) { diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilOldTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilOldTests.java index 895eb9da8a4..309116002f9 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilOldTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilOldTests.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.lrparser.tests.LRUtilOldTests; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestSuite; + public class XlcLRUtilOldTests extends LRUtilOldTests { public static TestSuite suite() { return suite(XlcLRUtilOldTests.class); diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilTests.java index 5026cd26895..4c32284313a 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilTests.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.lrparser.tests.LRUtilTests; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; +import junit.framework.TestSuite; + public class XlcLRUtilTests extends LRUtilTests { public static TestSuite suite() { return suite(XlcLRUtilTests.class); diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/suite/AutomatedIntegrationSuite.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/suite/AutomatedIntegrationSuite.java index 280a4f4dde6..9e612d97bc7 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/suite/AutomatedIntegrationSuite.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/suite/AutomatedIntegrationSuite.java @@ -13,12 +13,12 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.suite; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.parser.xlc.tests.XlcExtensionsTestSuite; import org.eclipse.cdt.core.parser.xlc.tests.base.XlcLRParserTestSuite; +import junit.framework.Test; +import junit.framework.TestSuite; + public class AutomatedIntegrationSuite extends TestSuite { public static Test suite() { diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPTokenMap.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPTokenMap.java index fae72b3c1a2..c0a5992a9a9 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPTokenMap.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPTokenMap.java @@ -13,8 +13,266 @@ *******************************************************************************/ package org.eclipse.cdt.core.lrparser.xlc; -import static org.eclipse.cdt.core.parser.IToken.*; -import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.*; +import static org.eclipse.cdt.core.parser.IToken.tAMPER; +import static org.eclipse.cdt.core.parser.IToken.tAMPERASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tAND; +import static org.eclipse.cdt.core.parser.IToken.tARROW; +import static org.eclipse.cdt.core.parser.IToken.tARROWSTAR; +import static org.eclipse.cdt.core.parser.IToken.tASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tBITCOMPLEMENT; +import static org.eclipse.cdt.core.parser.IToken.tBITOR; +import static org.eclipse.cdt.core.parser.IToken.tBITORASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tCHAR; +import static org.eclipse.cdt.core.parser.IToken.tCOLON; +import static org.eclipse.cdt.core.parser.IToken.tCOLONCOLON; +import static org.eclipse.cdt.core.parser.IToken.tCOMMA; +import static org.eclipse.cdt.core.parser.IToken.tCOMPLETION; +import static org.eclipse.cdt.core.parser.IToken.tDECR; +import static org.eclipse.cdt.core.parser.IToken.tDIV; +import static org.eclipse.cdt.core.parser.IToken.tDIVASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tDOT; +import static org.eclipse.cdt.core.parser.IToken.tDOTSTAR; +import static org.eclipse.cdt.core.parser.IToken.tELLIPSIS; +import static org.eclipse.cdt.core.parser.IToken.tEND_OF_INPUT; +import static org.eclipse.cdt.core.parser.IToken.tEOC; +import static org.eclipse.cdt.core.parser.IToken.tEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tFLOATINGPT; +import static org.eclipse.cdt.core.parser.IToken.tGT; +import static org.eclipse.cdt.core.parser.IToken.tGTEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tIDENTIFIER; +import static org.eclipse.cdt.core.parser.IToken.tINCR; +import static org.eclipse.cdt.core.parser.IToken.tINTEGER; +import static org.eclipse.cdt.core.parser.IToken.tLBRACE; +import static org.eclipse.cdt.core.parser.IToken.tLBRACKET; +import static org.eclipse.cdt.core.parser.IToken.tLCHAR; +import static org.eclipse.cdt.core.parser.IToken.tLPAREN; +import static org.eclipse.cdt.core.parser.IToken.tLSTRING; +import static org.eclipse.cdt.core.parser.IToken.tLT; +import static org.eclipse.cdt.core.parser.IToken.tLTEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tMINUS; +import static org.eclipse.cdt.core.parser.IToken.tMINUSASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tMOD; +import static org.eclipse.cdt.core.parser.IToken.tMODASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tNOT; +import static org.eclipse.cdt.core.parser.IToken.tNOTEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tOR; +import static org.eclipse.cdt.core.parser.IToken.tPLUS; +import static org.eclipse.cdt.core.parser.IToken.tPLUSASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tPOUND; +import static org.eclipse.cdt.core.parser.IToken.tQUESTION; +import static org.eclipse.cdt.core.parser.IToken.tRBRACE; +import static org.eclipse.cdt.core.parser.IToken.tRBRACKET; +import static org.eclipse.cdt.core.parser.IToken.tRPAREN; +import static org.eclipse.cdt.core.parser.IToken.tSEMI; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTL; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTLASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTR; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTRASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tSTAR; +import static org.eclipse.cdt.core.parser.IToken.tSTARASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tSTRING; +import static org.eclipse.cdt.core.parser.IToken.tUNKNOWN_CHAR; +import static org.eclipse.cdt.core.parser.IToken.tUTF16CHAR; +import static org.eclipse.cdt.core.parser.IToken.tUTF16STRING; +import static org.eclipse.cdt.core.parser.IToken.tUTF32CHAR; +import static org.eclipse.cdt.core.parser.IToken.tUTF32STRING; +import static org.eclipse.cdt.core.parser.IToken.tXOR; +import static org.eclipse.cdt.core.parser.IToken.tXORASSIGN; +import static org.eclipse.cdt.core.parser.IToken.t__Complex; +import static org.eclipse.cdt.core.parser.IToken.t__Imaginary; +import static org.eclipse.cdt.core.parser.IToken.t_asm; +import static org.eclipse.cdt.core.parser.IToken.t_auto; +import static org.eclipse.cdt.core.parser.IToken.t_bool; +import static org.eclipse.cdt.core.parser.IToken.t_break; +import static org.eclipse.cdt.core.parser.IToken.t_case; +import static org.eclipse.cdt.core.parser.IToken.t_catch; +import static org.eclipse.cdt.core.parser.IToken.t_char; +import static org.eclipse.cdt.core.parser.IToken.t_class; +import static org.eclipse.cdt.core.parser.IToken.t_const; +import static org.eclipse.cdt.core.parser.IToken.t_const_cast; +import static org.eclipse.cdt.core.parser.IToken.t_continue; +import static org.eclipse.cdt.core.parser.IToken.t_default; +import static org.eclipse.cdt.core.parser.IToken.t_delete; +import static org.eclipse.cdt.core.parser.IToken.t_do; +import static org.eclipse.cdt.core.parser.IToken.t_double; +import static org.eclipse.cdt.core.parser.IToken.t_dynamic_cast; +import static org.eclipse.cdt.core.parser.IToken.t_else; +import static org.eclipse.cdt.core.parser.IToken.t_enum; +import static org.eclipse.cdt.core.parser.IToken.t_explicit; +import static org.eclipse.cdt.core.parser.IToken.t_export; +import static org.eclipse.cdt.core.parser.IToken.t_extern; +import static org.eclipse.cdt.core.parser.IToken.t_false; +import static org.eclipse.cdt.core.parser.IToken.t_float; +import static org.eclipse.cdt.core.parser.IToken.t_for; +import static org.eclipse.cdt.core.parser.IToken.t_friend; +import static org.eclipse.cdt.core.parser.IToken.t_goto; +import static org.eclipse.cdt.core.parser.IToken.t_if; +import static org.eclipse.cdt.core.parser.IToken.t_inline; +import static org.eclipse.cdt.core.parser.IToken.t_int; +import static org.eclipse.cdt.core.parser.IToken.t_long; +import static org.eclipse.cdt.core.parser.IToken.t_mutable; +import static org.eclipse.cdt.core.parser.IToken.t_namespace; +import static org.eclipse.cdt.core.parser.IToken.t_new; +import static org.eclipse.cdt.core.parser.IToken.t_operator; +import static org.eclipse.cdt.core.parser.IToken.t_private; +import static org.eclipse.cdt.core.parser.IToken.t_protected; +import static org.eclipse.cdt.core.parser.IToken.t_public; +import static org.eclipse.cdt.core.parser.IToken.t_register; +import static org.eclipse.cdt.core.parser.IToken.t_reinterpret_cast; +import static org.eclipse.cdt.core.parser.IToken.t_restrict; +import static org.eclipse.cdt.core.parser.IToken.t_return; +import static org.eclipse.cdt.core.parser.IToken.t_short; +import static org.eclipse.cdt.core.parser.IToken.t_signed; +import static org.eclipse.cdt.core.parser.IToken.t_sizeof; +import static org.eclipse.cdt.core.parser.IToken.t_static; +import static org.eclipse.cdt.core.parser.IToken.t_static_cast; +import static org.eclipse.cdt.core.parser.IToken.t_struct; +import static org.eclipse.cdt.core.parser.IToken.t_switch; +import static org.eclipse.cdt.core.parser.IToken.t_template; +import static org.eclipse.cdt.core.parser.IToken.t_this; +import static org.eclipse.cdt.core.parser.IToken.t_throw; +import static org.eclipse.cdt.core.parser.IToken.t_true; +import static org.eclipse.cdt.core.parser.IToken.t_try; +import static org.eclipse.cdt.core.parser.IToken.t_typedef; +import static org.eclipse.cdt.core.parser.IToken.t_typeid; +import static org.eclipse.cdt.core.parser.IToken.t_typename; +import static org.eclipse.cdt.core.parser.IToken.t_union; +import static org.eclipse.cdt.core.parser.IToken.t_unsigned; +import static org.eclipse.cdt.core.parser.IToken.t_using; +import static org.eclipse.cdt.core.parser.IToken.t_virtual; +import static org.eclipse.cdt.core.parser.IToken.t_void; +import static org.eclipse.cdt.core.parser.IToken.t_volatile; +import static org.eclipse.cdt.core.parser.IToken.t_wchar_t; +import static org.eclipse.cdt.core.parser.IToken.t_while; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_And; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_AndAnd; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_AndAssign; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Arrow; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_ArrowStar; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Assign; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Bang; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Caret; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_CaretAssign; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Colon; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_ColonColon; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Comma; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Completion; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Dot; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_DotDotDot; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_DotStar; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_EOF_TOKEN; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_EQ; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_EndOfCompletion; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_GE; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_GT; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Invalid; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_LE; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_LT; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_LeftBrace; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_LeftBracket; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_LeftParen; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_LeftShift; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_LeftShiftAssign; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_MAX; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_MIN; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Minus; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_MinusAssign; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_MinusMinus; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_NE; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Or; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_OrAssign; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_OrOr; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Percent; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_PercentAssign; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Plus; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_PlusAssign; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_PlusPlus; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Question; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_RightBrace; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_RightBracket; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_RightParen; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_RightShift; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_RightShiftAssign; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_SemiColon; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Slash; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_SlashAssign; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Star; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_StarAssign; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_Tilde; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK__Imaginary; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK___alignof__; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK___attribute__; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK___declspec; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_asm; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_auto; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_bool; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_break; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_case; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_catch; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_char; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_charconst; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_class; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_const; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_const_cast; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_continue; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_default; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_delete; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_do; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_double; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_dynamic_cast; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_else; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_enum; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_explicit; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_export; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_extern; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_false; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_float; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_floating; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_for; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_friend; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_goto; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_identifier; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_if; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_inline; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_int; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_integer; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_long; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_mutable; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_namespace; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_new; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_operator; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_private; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_protected; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_public; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_register; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_reinterpret_cast; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_restrict; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_return; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_short; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_signed; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_sizeof; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_static; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_static_cast; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_stringlit; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_struct; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_switch; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_template; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_this; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_throw; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_true; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_try; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_typedef; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_typeid; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_typename; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_typeof; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_union; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_unsigned; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_using; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_virtual; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_void; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_volatile; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_wchar_t; +import static org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym.TK_while; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.parser.IGCCToken; diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCTokenMap.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCTokenMap.java index 9179ee616ee..c7d026c46d5 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCTokenMap.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCTokenMap.java @@ -13,8 +13,204 @@ *******************************************************************************/ package org.eclipse.cdt.core.lrparser.xlc; -import static org.eclipse.cdt.core.parser.IToken.*; -import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.*; +import static org.eclipse.cdt.core.parser.IToken.tAMPER; +import static org.eclipse.cdt.core.parser.IToken.tAMPERASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tAND; +import static org.eclipse.cdt.core.parser.IToken.tARROW; +import static org.eclipse.cdt.core.parser.IToken.tASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tBITCOMPLEMENT; +import static org.eclipse.cdt.core.parser.IToken.tBITOR; +import static org.eclipse.cdt.core.parser.IToken.tBITORASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tCHAR; +import static org.eclipse.cdt.core.parser.IToken.tCOLON; +import static org.eclipse.cdt.core.parser.IToken.tCOMMA; +import static org.eclipse.cdt.core.parser.IToken.tCOMPLETION; +import static org.eclipse.cdt.core.parser.IToken.tDECR; +import static org.eclipse.cdt.core.parser.IToken.tDIV; +import static org.eclipse.cdt.core.parser.IToken.tDIVASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tDOT; +import static org.eclipse.cdt.core.parser.IToken.tELLIPSIS; +import static org.eclipse.cdt.core.parser.IToken.tEND_OF_INPUT; +import static org.eclipse.cdt.core.parser.IToken.tEOC; +import static org.eclipse.cdt.core.parser.IToken.tEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tFLOATINGPT; +import static org.eclipse.cdt.core.parser.IToken.tGT; +import static org.eclipse.cdt.core.parser.IToken.tGTEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tIDENTIFIER; +import static org.eclipse.cdt.core.parser.IToken.tINCR; +import static org.eclipse.cdt.core.parser.IToken.tINTEGER; +import static org.eclipse.cdt.core.parser.IToken.tLBRACE; +import static org.eclipse.cdt.core.parser.IToken.tLBRACKET; +import static org.eclipse.cdt.core.parser.IToken.tLCHAR; +import static org.eclipse.cdt.core.parser.IToken.tLPAREN; +import static org.eclipse.cdt.core.parser.IToken.tLSTRING; +import static org.eclipse.cdt.core.parser.IToken.tLT; +import static org.eclipse.cdt.core.parser.IToken.tLTEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tMINUS; +import static org.eclipse.cdt.core.parser.IToken.tMINUSASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tMOD; +import static org.eclipse.cdt.core.parser.IToken.tMODASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tNOT; +import static org.eclipse.cdt.core.parser.IToken.tNOTEQUAL; +import static org.eclipse.cdt.core.parser.IToken.tOR; +import static org.eclipse.cdt.core.parser.IToken.tPLUS; +import static org.eclipse.cdt.core.parser.IToken.tPLUSASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tQUESTION; +import static org.eclipse.cdt.core.parser.IToken.tRBRACE; +import static org.eclipse.cdt.core.parser.IToken.tRBRACKET; +import static org.eclipse.cdt.core.parser.IToken.tRPAREN; +import static org.eclipse.cdt.core.parser.IToken.tSEMI; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTL; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTLASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTR; +import static org.eclipse.cdt.core.parser.IToken.tSHIFTRASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tSTAR; +import static org.eclipse.cdt.core.parser.IToken.tSTARASSIGN; +import static org.eclipse.cdt.core.parser.IToken.tSTRING; +import static org.eclipse.cdt.core.parser.IToken.tUNKNOWN_CHAR; +import static org.eclipse.cdt.core.parser.IToken.tUTF16CHAR; +import static org.eclipse.cdt.core.parser.IToken.tUTF16STRING; +import static org.eclipse.cdt.core.parser.IToken.tUTF32CHAR; +import static org.eclipse.cdt.core.parser.IToken.tUTF32STRING; +import static org.eclipse.cdt.core.parser.IToken.tXOR; +import static org.eclipse.cdt.core.parser.IToken.tXORASSIGN; +import static org.eclipse.cdt.core.parser.IToken.t__Bool; +import static org.eclipse.cdt.core.parser.IToken.t__Complex; +import static org.eclipse.cdt.core.parser.IToken.t__Imaginary; +import static org.eclipse.cdt.core.parser.IToken.t_asm; +import static org.eclipse.cdt.core.parser.IToken.t_auto; +import static org.eclipse.cdt.core.parser.IToken.t_break; +import static org.eclipse.cdt.core.parser.IToken.t_case; +import static org.eclipse.cdt.core.parser.IToken.t_char; +import static org.eclipse.cdt.core.parser.IToken.t_const; +import static org.eclipse.cdt.core.parser.IToken.t_continue; +import static org.eclipse.cdt.core.parser.IToken.t_default; +import static org.eclipse.cdt.core.parser.IToken.t_do; +import static org.eclipse.cdt.core.parser.IToken.t_double; +import static org.eclipse.cdt.core.parser.IToken.t_else; +import static org.eclipse.cdt.core.parser.IToken.t_enum; +import static org.eclipse.cdt.core.parser.IToken.t_extern; +import static org.eclipse.cdt.core.parser.IToken.t_float; +import static org.eclipse.cdt.core.parser.IToken.t_for; +import static org.eclipse.cdt.core.parser.IToken.t_goto; +import static org.eclipse.cdt.core.parser.IToken.t_if; +import static org.eclipse.cdt.core.parser.IToken.t_inline; +import static org.eclipse.cdt.core.parser.IToken.t_int; +import static org.eclipse.cdt.core.parser.IToken.t_long; +import static org.eclipse.cdt.core.parser.IToken.t_register; +import static org.eclipse.cdt.core.parser.IToken.t_restrict; +import static org.eclipse.cdt.core.parser.IToken.t_return; +import static org.eclipse.cdt.core.parser.IToken.t_short; +import static org.eclipse.cdt.core.parser.IToken.t_signed; +import static org.eclipse.cdt.core.parser.IToken.t_sizeof; +import static org.eclipse.cdt.core.parser.IToken.t_static; +import static org.eclipse.cdt.core.parser.IToken.t_struct; +import static org.eclipse.cdt.core.parser.IToken.t_switch; +import static org.eclipse.cdt.core.parser.IToken.t_typedef; +import static org.eclipse.cdt.core.parser.IToken.t_union; +import static org.eclipse.cdt.core.parser.IToken.t_unsigned; +import static org.eclipse.cdt.core.parser.IToken.t_void; +import static org.eclipse.cdt.core.parser.IToken.t_volatile; +import static org.eclipse.cdt.core.parser.IToken.t_while; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_And; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_AndAnd; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_AndAssign; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Arrow; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Assign; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Bang; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Caret; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_CaretAssign; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Colon; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Comma; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Completion; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Dot; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_DotDotDot; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_EOF_TOKEN; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_EQ; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_EndOfCompletion; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_GE; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_GT; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Invalid; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_LE; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_LT; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_LeftBrace; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_LeftBracket; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_LeftParen; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_LeftShift; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_LeftShiftAssign; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_MAX; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_MIN; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Minus; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_MinusAssign; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_MinusMinus; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_NE; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Or; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_OrAssign; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_OrOr; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Percent; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_PercentAssign; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Plus; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_PlusAssign; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_PlusPlus; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Question; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_RightBrace; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_RightBracket; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_RightParen; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_RightShift; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_RightShiftAssign; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_SemiColon; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Slash; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_SlashAssign; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Star; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_StarAssign; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_Tilde; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK__Bool; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK__Complex; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK__Imaginary; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK___alignof__; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK___attribute__; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK___declspec; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_asm; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_auto; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_break; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_case; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_char; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_charconst; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_const; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_continue; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_default; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_do; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_double; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_else; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_enum; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_extern; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_float; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_floating; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_for; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_goto; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_identifier; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_if; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_inline; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_int; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_integer; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_long; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_register; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_restrict; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_return; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_short; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_signed; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_sizeof; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_static; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_stringlit; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_struct; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_switch; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_typedef; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_typeof; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_union; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_unsigned; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_void; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_volatile; +import static org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym.TK_while; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.parser.IGCCToken; diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/action/XlcCBuildASTParserAction.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/action/XlcCBuildASTParserAction.java index 19304d79492..f04c9f70cd1 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/action/XlcCBuildASTParserAction.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/action/XlcCBuildASTParserAction.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.lrparser.xlc.action; -import lpg.lpgjavaruntime.IToken; - import org.eclipse.cdt.core.dom.lrparser.action.ISecondaryParserFactory; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; @@ -23,6 +21,8 @@ import org.eclipse.cdt.core.lrparser.xlc.ast.IXlcCASTVectorTypeSpecifier; import org.eclipse.cdt.core.lrparser.xlc.ast.IXlcCNodeFactory; import org.eclipse.cdt.internal.core.lrparser.xlc.c.XlcCParsersym; +import lpg.lpgjavaruntime.IToken; + public class XlcCBuildASTParserAction extends GCCBuildASTParserAction { private IXlcCNodeFactory nodeFactory; diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/action/XlcCPPBuildASTParserAction.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/action/XlcCPPBuildASTParserAction.java index 195ad3abf62..936ad10bc5e 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/action/XlcCPPBuildASTParserAction.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/action/XlcCPPBuildASTParserAction.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.lrparser.xlc.action; -import lpg.lpgjavaruntime.IToken; - import org.eclipse.cdt.core.dom.ast.IASTExpression; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTStaticAssertDeclaration; @@ -29,6 +27,8 @@ import org.eclipse.cdt.core.lrparser.xlc.ast.IXlcCPPASTVectorTypeSpecifier; import org.eclipse.cdt.core.lrparser.xlc.ast.IXlcCPPNodeFactory; import org.eclipse.cdt.internal.core.lrparser.xlc.cpp.XlcCPPParsersym; +import lpg.lpgjavaruntime.IToken; + public class XlcCPPBuildASTParserAction extends GPPBuildASTParserAction { private IXlcCPPNodeFactory nodeFactory; diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParser.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParser.java index 5676192e0cd..cc4230a4305 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParser.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParser.java @@ -16,28 +16,51 @@ package org.eclipse.cdt.internal.core.lrparser.xlc.c; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.IASTCastExpression; +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCSecondaryParserFactory; +import org.eclipse.cdt.core.dom.lrparser.action.gnu.GNUBuildASTParserAction; +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; import org.eclipse.cdt.core.index.IIndex; - -import org.eclipse.cdt.core.dom.lrparser.action.gnu.GNUBuildASTParserAction; - -import org.eclipse.cdt.core.dom.lrparser.action.gnu.GCCSecondaryParserFactory; - import org.eclipse.cdt.core.lrparser.xlc.action.XlcCBuildASTParserAction; +import org.eclipse.cdt.core.parser.IScanner; import org.eclipse.cdt.internal.core.lrparser.xlc.ast.XlcCNodeFactory; +import lpg.lpgjavaruntime.BadParseException; +import lpg.lpgjavaruntime.BadParseSymFileException; +import lpg.lpgjavaruntime.DiagnoseParser; +import lpg.lpgjavaruntime.ErrorToken; +import lpg.lpgjavaruntime.IToken; +import lpg.lpgjavaruntime.LexStream; +import lpg.lpgjavaruntime.Monitor; +import lpg.lpgjavaruntime.NotBacktrackParseTableException; +import lpg.lpgjavaruntime.NullExportedSymbolsException; +import lpg.lpgjavaruntime.NullTerminalSymbolsException; +import lpg.lpgjavaruntime.ParseErrorCodes; +import lpg.lpgjavaruntime.ParseTable; +import lpg.lpgjavaruntime.PrsStream; +import lpg.lpgjavaruntime.RuleAction; +import lpg.lpgjavaruntime.TokenStream; +import lpg.lpgjavaruntime.UndefinedEofSymbolException; +import lpg.lpgjavaruntime.UnimplementedTerminalsException; + public class XlcCParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTTranslationUnit> diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParser.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParser.java index 6c0a202894c..4841efa0c9c 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParser.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParser.java @@ -16,31 +16,53 @@ package org.eclipse.cdt.internal.core.lrparser.xlc.cpp; -import lpg.lpgjavaruntime.*; - -import java.util.*; -import org.eclipse.cdt.core.dom.ast.*; +import java.util.List; +import java.util.Map; + +import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTBinaryExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTypeIdExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUnaryExpression; +import org.eclipse.cdt.core.dom.ast.gnu.cpp.IGPPASTExplicitTemplateInstantiation; +import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.IDOMTokenMap; import org.eclipse.cdt.core.dom.lrparser.IParser; import org.eclipse.cdt.core.dom.lrparser.ITokenCollector; -import org.eclipse.cdt.core.dom.lrparser.CPreprocessorAdapter; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; -import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; import org.eclipse.cdt.core.dom.lrparser.action.ScopedStack; -import org.eclipse.cdt.core.parser.IScanner; -import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; -import org.eclipse.cdt.core.index.IIndex; - -import org.eclipse.cdt.core.dom.ast.cpp.*; - import org.eclipse.cdt.core.dom.lrparser.action.gnu.GNUBuildASTParserAction; - import org.eclipse.cdt.core.dom.lrparser.action.gnu.GPPSecondaryParserFactory; -import org.eclipse.cdt.core.dom.ast.gnu.cpp.*; - +import org.eclipse.cdt.core.dom.lrparser.lpgextensions.FixedBacktrackingParser; +import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; +import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.lrparser.xlc.action.XlcCPPBuildASTParserAction; +import org.eclipse.cdt.core.parser.IScanner; import org.eclipse.cdt.internal.core.lrparser.xlc.ast.XlcCPPNodeFactory; +import lpg.lpgjavaruntime.BadParseException; +import lpg.lpgjavaruntime.BadParseSymFileException; +import lpg.lpgjavaruntime.DiagnoseParser; +import lpg.lpgjavaruntime.ErrorToken; +import lpg.lpgjavaruntime.IToken; +import lpg.lpgjavaruntime.LexStream; +import lpg.lpgjavaruntime.Monitor; +import lpg.lpgjavaruntime.NotBacktrackParseTableException; +import lpg.lpgjavaruntime.NullExportedSymbolsException; +import lpg.lpgjavaruntime.NullTerminalSymbolsException; +import lpg.lpgjavaruntime.ParseErrorCodes; +import lpg.lpgjavaruntime.ParseTable; +import lpg.lpgjavaruntime.PrsStream; +import lpg.lpgjavaruntime.RuleAction; +import lpg.lpgjavaruntime.TokenStream; +import lpg.lpgjavaruntime.UndefinedEofSymbolException; +import lpg.lpgjavaruntime.UnimplementedTerminalsException; + public class XlcCPPParser extends PrsStream implements RuleAction, ITokenStream, ITokenCollector, IParser<IASTTranslationUnit> diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestCommandOptionNotRecognized.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestCommandOptionNotRecognized.java index 7904328d1e0..a0e7b916ee5 100644 --- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestCommandOptionNotRecognized.java +++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestCommandOptionNotRecognized.java @@ -13,10 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.errorparsers.xlc.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.IMarkerGenerator; +import junit.framework.TestCase; + public class TestCommandOptionNotRecognized extends TestCase { String err_msg; diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestCompatibility.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestCompatibility.java index 53ac930ce33..8110adb70bf 100644 --- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestCompatibility.java +++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestCompatibility.java @@ -13,10 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.errorparsers.xlc.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.IMarkerGenerator; +import junit.framework.TestCase; + public class TestCompatibility extends TestCase { String err_msg; diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestError_1.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestError_1.java index adc57131338..1c6024136c9 100644 --- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestError_1.java +++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestError_1.java @@ -14,10 +14,10 @@ package org.eclipse.cdt.errorparsers.xlc.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.IMarkerGenerator; +import junit.framework.TestCase; + public class TestError_1 extends TestCase { String err_msg; diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestInformationalMessage_1.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestInformationalMessage_1.java index d27a8a715de..f40127588f6 100644 --- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestInformationalMessage_1.java +++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestInformationalMessage_1.java @@ -14,10 +14,10 @@ package org.eclipse.cdt.errorparsers.xlc.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.IMarkerGenerator; +import junit.framework.TestCase; + public class TestInformationalMessage_1 extends TestCase { String err_msg; diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestInformationalMessage_2.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestInformationalMessage_2.java index 5b8796612a0..a1e44792fce 100644 --- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestInformationalMessage_2.java +++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestInformationalMessage_2.java @@ -13,10 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.errorparsers.xlc.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.IMarkerGenerator; +import junit.framework.TestCase; + public class TestInformationalMessage_2 extends TestCase { String err_msg; diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestInformationalMessage_3.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestInformationalMessage_3.java index 8d63f8bce58..448ac65ec2f 100644 --- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestInformationalMessage_3.java +++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestInformationalMessage_3.java @@ -13,10 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.errorparsers.xlc.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.IMarkerGenerator; +import junit.framework.TestCase; + public class TestInformationalMessage_3 extends TestCase { String err_msg; diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestLinkerCommandOptionNotRecognized.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestLinkerCommandOptionNotRecognized.java index a91f48715f6..5fd4f205e44 100644 --- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestLinkerCommandOptionNotRecognized.java +++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestLinkerCommandOptionNotRecognized.java @@ -14,10 +14,10 @@ package org.eclipse.cdt.errorparsers.xlc.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.IMarkerGenerator; +import junit.framework.TestCase; + public class TestLinkerCommandOptionNotRecognized extends TestCase { String err_msg; diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestLinkerDuplicateSymbol.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestLinkerDuplicateSymbol.java index f89e6384064..f498ca864fd 100644 --- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestLinkerDuplicateSymbol.java +++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestLinkerDuplicateSymbol.java @@ -14,10 +14,10 @@ package org.eclipse.cdt.errorparsers.xlc.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.IMarkerGenerator; +import junit.framework.TestCase; + public class TestLinkerDuplicateSymbol extends TestCase { String err_msg; diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestLinkerErrorWhileReading.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestLinkerErrorWhileReading.java index af5393f4983..c8a3b116e88 100644 --- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestLinkerErrorWhileReading.java +++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestLinkerErrorWhileReading.java @@ -14,10 +14,10 @@ package org.eclipse.cdt.errorparsers.xlc.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.IMarkerGenerator; +import junit.framework.TestCase; + public class TestLinkerErrorWhileReading extends TestCase { String err_msg; diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestLinkerInfo.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestLinkerInfo.java index 722af545c09..4c7fe713125 100644 --- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestLinkerInfo.java +++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestLinkerInfo.java @@ -14,10 +14,10 @@ package org.eclipse.cdt.errorparsers.xlc.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.IMarkerGenerator; +import junit.framework.TestCase; + public class TestLinkerInfo extends TestCase { String err_msg; diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestLinkerSevereError.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestLinkerSevereError.java index fd7d024a80d..15daa18f701 100644 --- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestLinkerSevereError.java +++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestLinkerSevereError.java @@ -14,10 +14,10 @@ package org.eclipse.cdt.errorparsers.xlc.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.IMarkerGenerator; +import junit.framework.TestCase; + public class TestLinkerSevereError extends TestCase { String err_msg; diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestLinkerUndefinedSymbol.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestLinkerUndefinedSymbol.java index 65e49ca4182..03059ae7d40 100644 --- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestLinkerUndefinedSymbol.java +++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestLinkerUndefinedSymbol.java @@ -14,10 +14,10 @@ package org.eclipse.cdt.errorparsers.xlc.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.IMarkerGenerator; +import junit.framework.TestCase; + public class TestLinkerUndefinedSymbol extends TestCase { String err_msg; diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestRedeclaration.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestRedeclaration.java index 4b5f3361d86..4545f8f8aa7 100644 --- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestRedeclaration.java +++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestRedeclaration.java @@ -13,10 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.errorparsers.xlc.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.IMarkerGenerator; +import junit.framework.TestCase; + public class TestRedeclaration extends TestCase { /** * This function tests parseLine function of the diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestRedefinition.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestRedefinition.java index 9ec6f5412cd..d2fddf4c6be 100644 --- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestRedefinition.java +++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestRedefinition.java @@ -13,10 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.errorparsers.xlc.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.IMarkerGenerator; +import junit.framework.TestCase; + public class TestRedefinition extends TestCase { /** * This function tests parseLine function of the diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_1.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_1.java index 497bb1ef2cf..09358ce8a63 100644 --- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_1.java +++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_1.java @@ -13,10 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.errorparsers.xlc.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.IMarkerGenerator; +import junit.framework.TestCase; + public class TestSevereError_1 extends TestCase { String err_msg; diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_2.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_2.java index b75f9fab4a2..cf7ab77bfab 100644 --- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_2.java +++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_2.java @@ -14,10 +14,10 @@ package org.eclipse.cdt.errorparsers.xlc.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.IMarkerGenerator; +import junit.framework.TestCase; + public class TestSevereError_2 extends TestCase { String err_msg; diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_3.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_3.java index 68a929c5cc8..e2a32aa19e5 100644 --- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_3.java +++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_3.java @@ -14,10 +14,10 @@ package org.eclipse.cdt.errorparsers.xlc.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.IMarkerGenerator; +import junit.framework.TestCase; + public class TestSevereError_3 extends TestCase { String err_msg; diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_4.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_4.java index 874d3d7ff27..ae723851fd7 100644 --- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_4.java +++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_4.java @@ -14,10 +14,10 @@ package org.eclipse.cdt.errorparsers.xlc.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.IMarkerGenerator; +import junit.framework.TestCase; + public class TestSevereError_4 extends TestCase { String err_msg; diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_5.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_5.java index 85c6de53283..87f6f35fea4 100644 --- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_5.java +++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_5.java @@ -13,10 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.errorparsers.xlc.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.IMarkerGenerator; +import junit.framework.TestCase; + public class TestSevereError_5 extends TestCase { String err_msg; diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestUnrecoverableError_1.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestUnrecoverableError_1.java index 30a44c7882a..6ec0025598f 100644 --- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestUnrecoverableError_1.java +++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestUnrecoverableError_1.java @@ -13,10 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.errorparsers.xlc.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.IMarkerGenerator; +import junit.framework.TestCase; + public class TestUnrecoverableError_1 extends TestCase { String err_msg; diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestUnrecoverableError_2.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestUnrecoverableError_2.java index 5db28e28afc..ecaa304bc9c 100644 --- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestUnrecoverableError_2.java +++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestUnrecoverableError_2.java @@ -13,10 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.errorparsers.xlc.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.IMarkerGenerator; +import junit.framework.TestCase; + public class TestUnrecoverableError_2 extends TestCase { String err_msg; diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestUnrecoverableError_3.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestUnrecoverableError_3.java index 82635bcfed6..41615b877db 100644 --- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestUnrecoverableError_3.java +++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestUnrecoverableError_3.java @@ -13,10 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.errorparsers.xlc.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.IMarkerGenerator; +import junit.framework.TestCase; + public class TestUnrecoverableError_3 extends TestCase { String err_msg; diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestWarning_1.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestWarning_1.java index 7cfa9d55275..632fb9254a3 100644 --- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestWarning_1.java +++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestWarning_1.java @@ -13,10 +13,10 @@ *******************************************************************************/ package org.eclipse.cdt.errorparsers.xlc.tests; -import junit.framework.TestCase; - import org.eclipse.cdt.core.IMarkerGenerator; +import junit.framework.TestCase; + public class TestWarning_1 extends TestCase { String err_msg; diff --git a/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XlCSpecsConsoleParser.java b/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XlCSpecsConsoleParser.java index 65e96ccdbb9..35f7fc71547 100644 --- a/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XlCSpecsConsoleParser.java +++ b/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XlCSpecsConsoleParser.java @@ -20,6 +20,7 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.eclipse.cdt.core.CCProjectNature; import org.eclipse.cdt.core.IMarkerGenerator; import org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector; import org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector2; @@ -27,12 +28,9 @@ import org.eclipse.cdt.make.core.scannerconfig.IScannerInfoConsoleParser; import org.eclipse.cdt.make.core.scannerconfig.ScannerInfoTypes; import org.eclipse.cdt.make.internal.core.scannerconfig.util.TraceUtil; import org.eclipse.cdt.make.xlc.core.activator.Activator; -import org.eclipse.cdt.managedbuilder.scannerconfig.IManagedScannerInfoCollector; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; -import org.eclipse.cdt.core.CCProjectNature; -import org.eclipse.cdt.core.CProjectNature; /** * Parses output of ppuxlc -E -v specs.c or ppuxlc -E -v specs.cpp command |