CleanUp: Correct Java import order
diff --git a/ecommons.edb/org.eclipse.statet.ecommons.edb.core/.settings/org.eclipse.jdt.ui.prefs b/ecommons.edb/org.eclipse.statet.ecommons.edb.core/.settings/org.eclipse.jdt.ui.prefs
index abdf3e0..ecf6dfa 100644
--- a/ecommons.edb/org.eclipse.statet.ecommons.edb.core/.settings/org.eclipse.jdt.ui.prefs
+++ b/ecommons.edb/org.eclipse.statet.ecommons.edb.core/.settings/org.eclipse.jdt.ui.prefs
@@ -64,7 +64,7 @@
org.eclipse.jdt.ui.exception.name=e
org.eclipse.jdt.ui.gettersetter.use.is=true
org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet;
+org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet.jcommons;org.eclipse.statet;
org.eclipse.jdt.ui.javadoc=true
org.eclipse.jdt.ui.keywordthis=true
org.eclipse.jdt.ui.ondemandthreshold=99
diff --git a/ecommons.waltable/org.eclipse.statet.ecommons.waltable.core/.settings/org.eclipse.jdt.ui.prefs b/ecommons.waltable/org.eclipse.statet.ecommons.waltable.core/.settings/org.eclipse.jdt.ui.prefs
index abdf3e0..ecf6dfa 100644
--- a/ecommons.waltable/org.eclipse.statet.ecommons.waltable.core/.settings/org.eclipse.jdt.ui.prefs
+++ b/ecommons.waltable/org.eclipse.statet.ecommons.waltable.core/.settings/org.eclipse.jdt.ui.prefs
@@ -64,7 +64,7 @@
org.eclipse.jdt.ui.exception.name=e
org.eclipse.jdt.ui.gettersetter.use.is=true
org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet;
+org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet.jcommons;org.eclipse.statet;
org.eclipse.jdt.ui.javadoc=true
org.eclipse.jdt.ui.keywordthis=true
org.eclipse.jdt.ui.ondemandthreshold=99
diff --git a/ecommons/org.eclipse.statet.ecommons.coremisc/.settings/org.eclipse.jdt.ui.prefs b/ecommons/org.eclipse.statet.ecommons.coremisc/.settings/org.eclipse.jdt.ui.prefs
index abdf3e0..ecf6dfa 100644
--- a/ecommons/org.eclipse.statet.ecommons.coremisc/.settings/org.eclipse.jdt.ui.prefs
+++ b/ecommons/org.eclipse.statet.ecommons.coremisc/.settings/org.eclipse.jdt.ui.prefs
@@ -64,7 +64,7 @@
org.eclipse.jdt.ui.exception.name=e
org.eclipse.jdt.ui.gettersetter.use.is=true
org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet;
+org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet.jcommons;org.eclipse.statet;
org.eclipse.jdt.ui.javadoc=true
org.eclipse.jdt.ui.keywordthis=true
org.eclipse.jdt.ui.ondemandthreshold=99
diff --git a/ecommons/org.eclipse.statet.ecommons.coremisc/src/org/eclipse/statet/ecommons/preferences/SettingsChangeNotifier.java b/ecommons/org.eclipse.statet.ecommons.coremisc/src/org/eclipse/statet/ecommons/preferences/SettingsChangeNotifier.java
index a584f09..c0f3a56 100644
--- a/ecommons/org.eclipse.statet.ecommons.coremisc/src/org/eclipse/statet/ecommons/preferences/SettingsChangeNotifier.java
+++ b/ecommons/org.eclipse.statet.ecommons.coremisc/src/org/eclipse/statet/ecommons/preferences/SettingsChangeNotifier.java
@@ -27,9 +27,10 @@
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.statet.internal.ecommons.preferences.Messages;
import org.eclipse.statet.jcommons.lang.Disposable;
+import org.eclipse.statet.internal.ecommons.preferences.Messages;
+
public class SettingsChangeNotifier implements ISchedulingRule, Disposable {
diff --git a/ecommons/org.eclipse.statet.ecommons.coremisc/src/org/eclipse/statet/ecommons/resources/core/AbstractProjectNature.java b/ecommons/org.eclipse.statet.ecommons.coremisc/src/org/eclipse/statet/ecommons/resources/core/AbstractProjectNature.java
index fde8f8f..7deef3e 100644
--- a/ecommons/org.eclipse.statet.ecommons.coremisc/src/org/eclipse/statet/ecommons/resources/core/AbstractProjectNature.java
+++ b/ecommons/org.eclipse.statet.ecommons.coremisc/src/org/eclipse/statet/ecommons/resources/core/AbstractProjectNature.java
@@ -24,11 +24,12 @@
import org.eclipse.core.runtime.preferences.IScopeContext;
import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.statet.jcommons.collections.ImCollections;
+import org.eclipse.statet.jcommons.collections.ImList;
+
import org.eclipse.statet.ecommons.preferences.core.Preference;
import org.eclipse.statet.ecommons.preferences.core.util.PreferenceAccessWrapper;
import org.eclipse.statet.ecommons.preferences.core.util.PreferenceUtils;
-import org.eclipse.statet.jcommons.collections.ImCollections;
-import org.eclipse.statet.jcommons.collections.ImList;
public class AbstractProjectNature extends PreferenceAccessWrapper implements IProjectNature {
diff --git a/ecommons/org.eclipse.statet.ecommons.coremisc/src/org/eclipse/statet/internal/ecommons/coreutils/CoreMiscellanyPlugin.java b/ecommons/org.eclipse.statet.ecommons.coremisc/src/org/eclipse/statet/internal/ecommons/coreutils/CoreMiscellanyPlugin.java
index c272690..86e9c91 100644
--- a/ecommons/org.eclipse.statet.ecommons.coremisc/src/org/eclipse/statet/internal/ecommons/coreutils/CoreMiscellanyPlugin.java
+++ b/ecommons/org.eclipse.statet.ecommons.coremisc/src/org/eclipse/statet/internal/ecommons/coreutils/CoreMiscellanyPlugin.java
@@ -22,9 +22,10 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Plugin;
-import org.eclipse.statet.ecommons.preferences.SettingsChangeNotifier;
import org.eclipse.statet.jcommons.lang.Disposable;
+import org.eclipse.statet.ecommons.preferences.SettingsChangeNotifier;
+
/**
* The activator class controls the plug-in life cycle
diff --git a/ecommons/org.eclipse.statet.ecommons.databinding.core/.settings/org.eclipse.jdt.ui.prefs b/ecommons/org.eclipse.statet.ecommons.databinding.core/.settings/org.eclipse.jdt.ui.prefs
index abdf3e0..ecf6dfa 100644
--- a/ecommons/org.eclipse.statet.ecommons.databinding.core/.settings/org.eclipse.jdt.ui.prefs
+++ b/ecommons/org.eclipse.statet.ecommons.databinding.core/.settings/org.eclipse.jdt.ui.prefs
@@ -64,7 +64,7 @@
org.eclipse.jdt.ui.exception.name=e
org.eclipse.jdt.ui.gettersetter.use.is=true
org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet;
+org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet.jcommons;org.eclipse.statet;
org.eclipse.jdt.ui.javadoc=true
org.eclipse.jdt.ui.keywordthis=true
org.eclipse.jdt.ui.ondemandthreshold=99
diff --git a/ecommons/org.eclipse.statet.ecommons.debug.core/.settings/org.eclipse.jdt.ui.prefs b/ecommons/org.eclipse.statet.ecommons.debug.core/.settings/org.eclipse.jdt.ui.prefs
index abdf3e0..ecf6dfa 100644
--- a/ecommons/org.eclipse.statet.ecommons.debug.core/.settings/org.eclipse.jdt.ui.prefs
+++ b/ecommons/org.eclipse.statet.ecommons.debug.core/.settings/org.eclipse.jdt.ui.prefs
@@ -64,7 +64,7 @@
org.eclipse.jdt.ui.exception.name=e
org.eclipse.jdt.ui.gettersetter.use.is=true
org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet;
+org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet.jcommons;org.eclipse.statet;
org.eclipse.jdt.ui.javadoc=true
org.eclipse.jdt.ui.keywordthis=true
org.eclipse.jdt.ui.ondemandthreshold=99
diff --git a/ecommons/org.eclipse.statet.ecommons.debug.core/src/org/eclipse/statet/ecommons/debug/core/util/LaunchConfigurationCollector.java b/ecommons/org.eclipse.statet.ecommons.debug.core/src/org/eclipse/statet/ecommons/debug/core/util/LaunchConfigurationCollector.java
index 798425d..1fdd8f9 100644
--- a/ecommons/org.eclipse.statet.ecommons.debug.core/src/org/eclipse/statet/ecommons/debug/core/util/LaunchConfigurationCollector.java
+++ b/ecommons/org.eclipse.statet.ecommons.debug.core/src/org/eclipse/statet/ecommons/debug/core/util/LaunchConfigurationCollector.java
@@ -23,12 +23,13 @@
import org.eclipse.debug.core.ILaunchConfigurationType;
import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.statet.ecommons.debug.core.ECommonsDebugCore;
-import org.eclipse.statet.internal.ecommons.debug.core.ECommonsDebugCorePlugin;
import org.eclipse.statet.jcommons.collections.CopyOnWriteListSet;
import org.eclipse.statet.jcommons.collections.ImList;
import org.eclipse.statet.jcommons.lang.Disposable;
+import org.eclipse.statet.ecommons.debug.core.ECommonsDebugCore;
+import org.eclipse.statet.internal.ecommons.debug.core.ECommonsDebugCorePlugin;
+
public class LaunchConfigurationCollector implements ILaunchConfigurationListener, Disposable {
diff --git a/ecommons/org.eclipse.statet.ecommons.debug.core/src/org/eclipse/statet/ecommons/debug/core/util/LaunchUtils.java b/ecommons/org.eclipse.statet.ecommons.debug.core/src/org/eclipse/statet/ecommons/debug/core/util/LaunchUtils.java
index 959bd5c..0813c29 100644
--- a/ecommons/org.eclipse.statet.ecommons.debug.core/src/org/eclipse/statet/ecommons/debug/core/util/LaunchUtils.java
+++ b/ecommons/org.eclipse.statet.ecommons.debug.core/src/org/eclipse/statet/ecommons/debug/core/util/LaunchUtils.java
@@ -43,9 +43,10 @@
import org.eclipse.debug.core.model.ILaunchConfigurationDelegate;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.statet.jcommons.collections.CaseInsensitiveMap;
+
import org.eclipse.statet.ecommons.debug.core.ECommonsDebugCore;
import org.eclipse.statet.internal.ecommons.debug.core.Messages;
-import org.eclipse.statet.jcommons.collections.CaseInsensitiveMap;
/**
diff --git a/ecommons/org.eclipse.statet.ecommons.debug.core/src/org/eclipse/statet/ecommons/resources/core/variables/ResourceVariables.java b/ecommons/org.eclipse.statet.ecommons.debug.core/src/org/eclipse/statet/ecommons/resources/core/variables/ResourceVariables.java
index 4b30141..91b7255 100644
--- a/ecommons/org.eclipse.statet.ecommons.debug.core/src/org/eclipse/statet/ecommons/resources/core/variables/ResourceVariables.java
+++ b/ecommons/org.eclipse.statet.ecommons.debug.core/src/org/eclipse/statet/ecommons/resources/core/variables/ResourceVariables.java
@@ -21,10 +21,11 @@
import org.eclipse.core.variables.IStringVariableManager;
import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.statet.ecommons.variables.core.DynamicVariable;
import org.eclipse.statet.jcommons.collections.ImCollections;
import org.eclipse.statet.jcommons.collections.ImList;
+import org.eclipse.statet.ecommons.variables.core.DynamicVariable;
+
public class ResourceVariables {
diff --git a/ecommons/org.eclipse.statet.ecommons.debug.ui/.settings/org.eclipse.jdt.ui.prefs b/ecommons/org.eclipse.statet.ecommons.debug.ui/.settings/org.eclipse.jdt.ui.prefs
index abdf3e0..ecf6dfa 100644
--- a/ecommons/org.eclipse.statet.ecommons.debug.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/ecommons/org.eclipse.statet.ecommons.debug.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -64,7 +64,7 @@
org.eclipse.jdt.ui.exception.name=e
org.eclipse.jdt.ui.gettersetter.use.is=true
org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet;
+org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet.jcommons;org.eclipse.statet;
org.eclipse.jdt.ui.javadoc=true
org.eclipse.jdt.ui.keywordthis=true
org.eclipse.jdt.ui.ondemandthreshold=99
diff --git a/ecommons/org.eclipse.statet.ecommons.debug.ui/src/org/eclipse/statet/ecommons/debug/ui/breakpoints/AbstractBreakpointDetailEditor.java b/ecommons/org.eclipse.statet.ecommons.debug.ui/src/org/eclipse/statet/ecommons/debug/ui/breakpoints/AbstractBreakpointDetailEditor.java
index 4b9a1f5..761a5db 100644
--- a/ecommons/org.eclipse.statet.ecommons.debug.ui/src/org/eclipse/statet/ecommons/debug/ui/breakpoints/AbstractBreakpointDetailEditor.java
+++ b/ecommons/org.eclipse.statet.ecommons.debug.ui/src/org/eclipse/statet/ecommons/debug/ui/breakpoints/AbstractBreakpointDetailEditor.java
@@ -38,11 +38,12 @@
import org.eclipse.ui.IWorkbenchPartConstants;
import org.eclipse.ui.statushandlers.StatusManager;
+import org.eclipse.statet.jcommons.collections.IdentitySet;
+
import org.eclipse.statet.ecommons.databinding.core.util.DirtyTracker;
import org.eclipse.statet.ecommons.debug.ui.ECommonsDebugUI;
import org.eclipse.statet.ecommons.ui.util.LayoutUtil;
import org.eclipse.statet.ecommons.ui.util.MessageUtils;
-import org.eclipse.statet.jcommons.collections.IdentitySet;
public abstract class AbstractBreakpointDetailEditor {
diff --git a/ecommons/org.eclipse.statet.ecommons.debug.ui/src/org/eclipse/statet/ecommons/debug/ui/breakpoints/AbstractBreakpointDetailPane.java b/ecommons/org.eclipse.statet.ecommons.debug.ui/src/org/eclipse/statet/ecommons/debug/ui/breakpoints/AbstractBreakpointDetailPane.java
index 66bf9f3..7d8e17c 100644
--- a/ecommons/org.eclipse.statet.ecommons.debug.ui/src/org/eclipse/statet/ecommons/debug/ui/breakpoints/AbstractBreakpointDetailPane.java
+++ b/ecommons/org.eclipse.statet.ecommons.debug.ui/src/org/eclipse/statet/ecommons/debug/ui/breakpoints/AbstractBreakpointDetailPane.java
@@ -28,9 +28,10 @@
import org.eclipse.ui.IViewSite;
import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.statet.ecommons.ui.util.LayoutUtil;
import org.eclipse.statet.jcommons.collections.CopyOnWriteIdentityListSet;
+import org.eclipse.statet.ecommons.ui.util.LayoutUtil;
+
/**
* Common detail pane function.
diff --git a/ecommons/org.eclipse.statet.ecommons.debug.ui/src/org/eclipse/statet/ecommons/debug/ui/config/InputArgumentsComposite.java b/ecommons/org.eclipse.statet.ecommons.debug.ui/src/org/eclipse/statet/ecommons/debug/ui/config/InputArgumentsComposite.java
index 19eb288..a60dd64 100644
--- a/ecommons/org.eclipse.statet.ecommons.debug.ui/src/org/eclipse/statet/ecommons/debug/ui/config/InputArgumentsComposite.java
+++ b/ecommons/org.eclipse.statet.ecommons.debug.ui/src/org/eclipse/statet/ecommons/debug/ui/config/InputArgumentsComposite.java
@@ -31,12 +31,13 @@
import org.eclipse.swt.widgets.MenuItem;
import org.eclipse.swt.widgets.Text;
+import org.eclipse.statet.jcommons.collections.ImList;
+
import org.eclipse.statet.ecommons.ui.components.CustomizableVariableSelectionDialog;
import org.eclipse.statet.ecommons.ui.components.WidgetToolsButton;
import org.eclipse.statet.ecommons.ui.util.LayoutUtil;
import org.eclipse.statet.ecommons.variables.core.VariableText2;
import org.eclipse.statet.internal.ecommons.debug.ui.Messages;
-import org.eclipse.statet.jcommons.collections.ImList;
/**
diff --git a/ecommons/org.eclipse.statet.ecommons.debug.ui/src/org/eclipse/statet/ecommons/debug/ui/config/LaunchConfigTabWithPresets.java b/ecommons/org.eclipse.statet.ecommons.debug.ui/src/org/eclipse/statet/ecommons/debug/ui/config/LaunchConfigTabWithPresets.java
index 0e1c88a..d812778 100644
--- a/ecommons/org.eclipse.statet.ecommons.debug.ui/src/org/eclipse/statet/ecommons/debug/ui/config/LaunchConfigTabWithPresets.java
+++ b/ecommons/org.eclipse.statet.ecommons.debug.ui/src/org/eclipse/statet/ecommons/debug/ui/config/LaunchConfigTabWithPresets.java
@@ -34,11 +34,12 @@
import org.eclipse.swt.widgets.MenuItem;
import org.eclipse.ui.statushandlers.StatusManager;
+import org.eclipse.statet.jcommons.collections.ImCollections;
+import org.eclipse.statet.jcommons.collections.ImList;
+
import org.eclipse.statet.ecommons.debug.ui.ECommonsDebugUI;
import org.eclipse.statet.ecommons.ui.components.DropDownButton;
import org.eclipse.statet.internal.ecommons.debug.ui.Messages;
-import org.eclipse.statet.jcommons.collections.ImCollections;
-import org.eclipse.statet.jcommons.collections.ImList;
public abstract class LaunchConfigTabWithPresets extends LaunchConfigTabWithDbc {
diff --git a/ecommons/org.eclipse.statet.ecommons.emf.core/.settings/org.eclipse.jdt.ui.prefs b/ecommons/org.eclipse.statet.ecommons.emf.core/.settings/org.eclipse.jdt.ui.prefs
index abdf3e0..ecf6dfa 100644
--- a/ecommons/org.eclipse.statet.ecommons.emf.core/.settings/org.eclipse.jdt.ui.prefs
+++ b/ecommons/org.eclipse.statet.ecommons.emf.core/.settings/org.eclipse.jdt.ui.prefs
@@ -64,7 +64,7 @@
org.eclipse.jdt.ui.exception.name=e
org.eclipse.jdt.ui.gettersetter.use.is=true
org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet;
+org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet.jcommons;org.eclipse.statet;
org.eclipse.jdt.ui.javadoc=true
org.eclipse.jdt.ui.keywordthis=true
org.eclipse.jdt.ui.ondemandthreshold=99
diff --git a/ecommons/org.eclipse.statet.ecommons.emf.ui/.settings/org.eclipse.jdt.ui.prefs b/ecommons/org.eclipse.statet.ecommons.emf.ui/.settings/org.eclipse.jdt.ui.prefs
index abdf3e0..ecf6dfa 100644
--- a/ecommons/org.eclipse.statet.ecommons.emf.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/ecommons/org.eclipse.statet.ecommons.emf.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -64,7 +64,7 @@
org.eclipse.jdt.ui.exception.name=e
org.eclipse.jdt.ui.gettersetter.use.is=true
org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet;
+org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet.jcommons;org.eclipse.statet;
org.eclipse.jdt.ui.javadoc=true
org.eclipse.jdt.ui.keywordthis=true
org.eclipse.jdt.ui.ondemandthreshold=99
diff --git a/ecommons/org.eclipse.statet.ecommons.net.core/.settings/org.eclipse.jdt.ui.prefs b/ecommons/org.eclipse.statet.ecommons.net.core/.settings/org.eclipse.jdt.ui.prefs
index abdf3e0..ecf6dfa 100644
--- a/ecommons/org.eclipse.statet.ecommons.net.core/.settings/org.eclipse.jdt.ui.prefs
+++ b/ecommons/org.eclipse.statet.ecommons.net.core/.settings/org.eclipse.jdt.ui.prefs
@@ -64,7 +64,7 @@
org.eclipse.jdt.ui.exception.name=e
org.eclipse.jdt.ui.gettersetter.use.is=true
org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet;
+org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet.jcommons;org.eclipse.statet;
org.eclipse.jdt.ui.javadoc=true
org.eclipse.jdt.ui.keywordthis=true
org.eclipse.jdt.ui.ondemandthreshold=99
diff --git a/ecommons/org.eclipse.statet.ecommons.preferences.core/.settings/org.eclipse.jdt.ui.prefs b/ecommons/org.eclipse.statet.ecommons.preferences.core/.settings/org.eclipse.jdt.ui.prefs
index abdf3e0..ecf6dfa 100644
--- a/ecommons/org.eclipse.statet.ecommons.preferences.core/.settings/org.eclipse.jdt.ui.prefs
+++ b/ecommons/org.eclipse.statet.ecommons.preferences.core/.settings/org.eclipse.jdt.ui.prefs
@@ -64,7 +64,7 @@
org.eclipse.jdt.ui.exception.name=e
org.eclipse.jdt.ui.gettersetter.use.is=true
org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet;
+org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet.jcommons;org.eclipse.statet;
org.eclipse.jdt.ui.javadoc=true
org.eclipse.jdt.ui.keywordthis=true
org.eclipse.jdt.ui.ondemandthreshold=99
diff --git a/ecommons/org.eclipse.statet.ecommons.preferences.core/src/org/eclipse/statet/ecommons/preferences/core/util/PreferenceAccessWrapper.java b/ecommons/org.eclipse.statet.ecommons.preferences.core/src/org/eclipse/statet/ecommons/preferences/core/util/PreferenceAccessWrapper.java
index accf5f0..49a8e78 100644
--- a/ecommons/org.eclipse.statet.ecommons.preferences.core/src/org/eclipse/statet/ecommons/preferences/core/util/PreferenceAccessWrapper.java
+++ b/ecommons/org.eclipse.statet.ecommons.preferences.core/src/org/eclipse/statet/ecommons/preferences/core/util/PreferenceAccessWrapper.java
@@ -20,13 +20,14 @@
import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
import org.eclipse.core.runtime.preferences.IScopeContext;
+import org.eclipse.statet.jcommons.collections.ImCollections;
+import org.eclipse.statet.jcommons.collections.ImList;
+import org.eclipse.statet.jcommons.collections.ImSet;
+
import org.eclipse.statet.ecommons.preferences.core.Preference;
import org.eclipse.statet.ecommons.preferences.core.PreferenceAccess;
import org.eclipse.statet.ecommons.preferences.core.PreferenceSetService;
import org.eclipse.statet.ecommons.preferences.core.PreferenceSetService.ChangeListener;
-import org.eclipse.statet.jcommons.collections.ImCollections;
-import org.eclipse.statet.jcommons.collections.ImList;
-import org.eclipse.statet.jcommons.collections.ImSet;
public class PreferenceAccessWrapper implements PreferenceAccess {
diff --git a/ecommons/org.eclipse.statet.ecommons.preferences.core/src/org/eclipse/statet/ecommons/preferences/core/util/PreferenceUtils.java b/ecommons/org.eclipse.statet.ecommons.preferences.core/src/org/eclipse/statet/ecommons/preferences/core/util/PreferenceUtils.java
index b6832fa..1ff4031 100644
--- a/ecommons/org.eclipse.statet.ecommons.preferences.core/src/org/eclipse/statet/ecommons/preferences/core/util/PreferenceUtils.java
+++ b/ecommons/org.eclipse.statet.ecommons.preferences.core/src/org/eclipse/statet/ecommons/preferences/core/util/PreferenceUtils.java
@@ -23,13 +23,14 @@
import org.eclipse.core.runtime.preferences.IScopeContext;
import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.statet.jcommons.collections.ImCollections;
+import org.eclipse.statet.jcommons.collections.ImList;
+import org.eclipse.statet.jcommons.collections.ImSet;
+
import org.eclipse.statet.ecommons.preferences.core.Preference;
import org.eclipse.statet.ecommons.preferences.core.PreferenceAccess;
import org.eclipse.statet.ecommons.preferences.core.PreferenceSetService;
import org.eclipse.statet.internal.ecommons.preferences.core.ECommonsPreferencesCorePlugin;
-import org.eclipse.statet.jcommons.collections.ImCollections;
-import org.eclipse.statet.jcommons.collections.ImList;
-import org.eclipse.statet.jcommons.collections.ImSet;
public final class PreferenceUtils {
diff --git a/ecommons/org.eclipse.statet.ecommons.preferences.core/src/org/eclipse/statet/internal/ecommons/preferences/core/DefaultPreferenceSetService.java b/ecommons/org.eclipse.statet.ecommons.preferences.core/src/org/eclipse/statet/internal/ecommons/preferences/core/DefaultPreferenceSetService.java
index 2492417..3c969d4 100644
--- a/ecommons/org.eclipse.statet.ecommons.preferences.core/src/org/eclipse/statet/internal/ecommons/preferences/core/DefaultPreferenceSetService.java
+++ b/ecommons/org.eclipse.statet.ecommons.preferences.core/src/org/eclipse/statet/internal/ecommons/preferences/core/DefaultPreferenceSetService.java
@@ -34,8 +34,6 @@
import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;
import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.statet.ecommons.preferences.core.Preference;
-import org.eclipse.statet.ecommons.preferences.core.PreferenceSetService;
import org.eclipse.statet.jcommons.collections.CopyOnWriteList;
import org.eclipse.statet.jcommons.collections.ImCollection;
import org.eclipse.statet.jcommons.collections.ImCollections;
@@ -44,6 +42,9 @@
import org.eclipse.statet.jcommons.collections.ImSet;
import org.eclipse.statet.jcommons.lang.Disposable;
+import org.eclipse.statet.ecommons.preferences.core.Preference;
+import org.eclipse.statet.ecommons.preferences.core.PreferenceSetService;
+
public final class DefaultPreferenceSetService implements PreferenceSetService, ISchedulingRule, Disposable {
diff --git a/ecommons/org.eclipse.statet.ecommons.preferences.core/src/org/eclipse/statet/internal/ecommons/preferences/core/ECommonsPreferencesCorePlugin.java b/ecommons/org.eclipse.statet.ecommons.preferences.core/src/org/eclipse/statet/internal/ecommons/preferences/core/ECommonsPreferencesCorePlugin.java
index ff6ec5a..26a761d 100644
--- a/ecommons/org.eclipse.statet.ecommons.preferences.core/src/org/eclipse/statet/internal/ecommons/preferences/core/ECommonsPreferencesCorePlugin.java
+++ b/ecommons/org.eclipse.statet.ecommons.preferences.core/src/org/eclipse/statet/internal/ecommons/preferences/core/ECommonsPreferencesCorePlugin.java
@@ -22,9 +22,10 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Plugin;
-import org.eclipse.statet.ecommons.preferences.core.PreferenceSetService;
import org.eclipse.statet.jcommons.lang.Disposable;
+import org.eclipse.statet.ecommons.preferences.core.PreferenceSetService;
+
public final class ECommonsPreferencesCorePlugin extends Plugin {
diff --git a/ecommons/org.eclipse.statet.ecommons.rmi.core/.settings/org.eclipse.jdt.ui.prefs b/ecommons/org.eclipse.statet.ecommons.rmi.core/.settings/org.eclipse.jdt.ui.prefs
index abdf3e0..ecf6dfa 100644
--- a/ecommons/org.eclipse.statet.ecommons.rmi.core/.settings/org.eclipse.jdt.ui.prefs
+++ b/ecommons/org.eclipse.statet.ecommons.rmi.core/.settings/org.eclipse.jdt.ui.prefs
@@ -64,7 +64,7 @@
org.eclipse.jdt.ui.exception.name=e
org.eclipse.jdt.ui.gettersetter.use.is=true
org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet;
+org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet.jcommons;org.eclipse.statet;
org.eclipse.jdt.ui.javadoc=true
org.eclipse.jdt.ui.keywordthis=true
org.eclipse.jdt.ui.ondemandthreshold=99
diff --git a/ecommons/org.eclipse.statet.ecommons.runtime.core/.settings/org.eclipse.jdt.ui.prefs b/ecommons/org.eclipse.statet.ecommons.runtime.core/.settings/org.eclipse.jdt.ui.prefs
index abdf3e0..ecf6dfa 100644
--- a/ecommons/org.eclipse.statet.ecommons.runtime.core/.settings/org.eclipse.jdt.ui.prefs
+++ b/ecommons/org.eclipse.statet.ecommons.runtime.core/.settings/org.eclipse.jdt.ui.prefs
@@ -64,7 +64,7 @@
org.eclipse.jdt.ui.exception.name=e
org.eclipse.jdt.ui.gettersetter.use.is=true
org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet;
+org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet.jcommons;org.eclipse.statet;
org.eclipse.jdt.ui.javadoc=true
org.eclipse.jdt.ui.keywordthis=true
org.eclipse.jdt.ui.ondemandthreshold=99
diff --git a/ecommons/org.eclipse.statet.ecommons.runtime.core/src/org/eclipse/statet/internal/ecommons/runtime/core/RuntimeCorePlugin.java b/ecommons/org.eclipse.statet.ecommons.runtime.core/src/org/eclipse/statet/internal/ecommons/runtime/core/RuntimeCorePlugin.java
index 7cbd673..2958bbf 100644
--- a/ecommons/org.eclipse.statet.ecommons.runtime.core/src/org/eclipse/statet/internal/ecommons/runtime/core/RuntimeCorePlugin.java
+++ b/ecommons/org.eclipse.statet.ecommons.runtime.core/src/org/eclipse/statet/internal/ecommons/runtime/core/RuntimeCorePlugin.java
@@ -22,9 +22,10 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Plugin;
-import org.eclipse.statet.ecommons.runtime.core.ECommonsRuntime;
import org.eclipse.statet.jcommons.lang.Disposable;
+import org.eclipse.statet.ecommons.runtime.core.ECommonsRuntime;
+
public final class RuntimeCorePlugin extends Plugin implements ECommonsRuntime.AppEnvironment {
diff --git a/ecommons/org.eclipse.statet.ecommons.runtime.ui/.settings/org.eclipse.jdt.ui.prefs b/ecommons/org.eclipse.statet.ecommons.runtime.ui/.settings/org.eclipse.jdt.ui.prefs
index abdf3e0..ecf6dfa 100644
--- a/ecommons/org.eclipse.statet.ecommons.runtime.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/ecommons/org.eclipse.statet.ecommons.runtime.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -64,7 +64,7 @@
org.eclipse.jdt.ui.exception.name=e
org.eclipse.jdt.ui.gettersetter.use.is=true
org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet;
+org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet.jcommons;org.eclipse.statet;
org.eclipse.jdt.ui.javadoc=true
org.eclipse.jdt.ui.keywordthis=true
org.eclipse.jdt.ui.ondemandthreshold=99
diff --git a/ecommons/org.eclipse.statet.ecommons.text.core-tests/.settings/org.eclipse.jdt.ui.prefs b/ecommons/org.eclipse.statet.ecommons.text.core-tests/.settings/org.eclipse.jdt.ui.prefs
index abdf3e0..ecf6dfa 100644
--- a/ecommons/org.eclipse.statet.ecommons.text.core-tests/.settings/org.eclipse.jdt.ui.prefs
+++ b/ecommons/org.eclipse.statet.ecommons.text.core-tests/.settings/org.eclipse.jdt.ui.prefs
@@ -64,7 +64,7 @@
org.eclipse.jdt.ui.exception.name=e
org.eclipse.jdt.ui.gettersetter.use.is=true
org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet;
+org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet.jcommons;org.eclipse.statet;
org.eclipse.jdt.ui.javadoc=true
org.eclipse.jdt.ui.keywordthis=true
org.eclipse.jdt.ui.ondemandthreshold=99
diff --git a/ecommons/org.eclipse.statet.ecommons.text.core/.settings/org.eclipse.jdt.ui.prefs b/ecommons/org.eclipse.statet.ecommons.text.core/.settings/org.eclipse.jdt.ui.prefs
index abdf3e0..ecf6dfa 100644
--- a/ecommons/org.eclipse.statet.ecommons.text.core/.settings/org.eclipse.jdt.ui.prefs
+++ b/ecommons/org.eclipse.statet.ecommons.text.core/.settings/org.eclipse.jdt.ui.prefs
@@ -64,7 +64,7 @@
org.eclipse.jdt.ui.exception.name=e
org.eclipse.jdt.ui.gettersetter.use.is=true
org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet;
+org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet.jcommons;org.eclipse.statet;
org.eclipse.jdt.ui.javadoc=true
org.eclipse.jdt.ui.keywordthis=true
org.eclipse.jdt.ui.ondemandthreshold=99
diff --git a/ecommons/org.eclipse.statet.ecommons.text.core/src/org/eclipse/statet/ecommons/text/core/DocumentEnhancer.java b/ecommons/org.eclipse.statet.ecommons.text.core/src/org/eclipse/statet/ecommons/text/core/DocumentEnhancer.java
index edd48a4..021bb67 100644
--- a/ecommons/org.eclipse.statet.ecommons.text.core/src/org/eclipse/statet/ecommons/text/core/DocumentEnhancer.java
+++ b/ecommons/org.eclipse.statet.ecommons.text.core/src/org/eclipse/statet/ecommons/text/core/DocumentEnhancer.java
@@ -24,9 +24,10 @@
import org.eclipse.jface.text.IDocumentPartitioningListenerExtension2;
import org.eclipse.jface.text.Position;
-import org.eclipse.statet.ecommons.text.core.util.TextUtils;
import org.eclipse.statet.jcommons.collections.CopyOnWriteIdentityListSet;
+import org.eclipse.statet.ecommons.text.core.util.TextUtils;
+
public class DocumentEnhancer {
diff --git a/ecommons/org.eclipse.statet.ecommons.text.core/src/org/eclipse/statet/ecommons/text/core/treepartitioner/ITreePartitionNode.java b/ecommons/org.eclipse.statet.ecommons.text.core/src/org/eclipse/statet/ecommons/text/core/treepartitioner/ITreePartitionNode.java
index 3a8b395..a934704 100644
--- a/ecommons/org.eclipse.statet.ecommons.text.core/src/org/eclipse/statet/ecommons/text/core/treepartitioner/ITreePartitionNode.java
+++ b/ecommons/org.eclipse.statet.ecommons.text.core/src/org/eclipse/statet/ecommons/text/core/treepartitioner/ITreePartitionNode.java
@@ -14,9 +14,10 @@
package org.eclipse.statet.ecommons.text.core.treepartitioner;
-import org.eclipse.statet.ecommons.text.core.ITextRegion;
import org.eclipse.statet.jcommons.collections.ImList;
+import org.eclipse.statet.ecommons.text.core.ITextRegion;
+
public interface ITreePartitionNode extends ITextRegion {
diff --git a/ecommons/org.eclipse.statet.ecommons.text.core/src/org/eclipse/statet/ecommons/text/core/treepartitioner/TreePartitioner.java b/ecommons/org.eclipse.statet.ecommons.text.core/src/org/eclipse/statet/ecommons/text/core/treepartitioner/TreePartitioner.java
index 2d7da03..c855d1d 100644
--- a/ecommons/org.eclipse.statet.ecommons.text.core/src/org/eclipse/statet/ecommons/text/core/treepartitioner/TreePartitioner.java
+++ b/ecommons/org.eclipse.statet.ecommons.text.core/src/org/eclipse/statet/ecommons/text/core/treepartitioner/TreePartitioner.java
@@ -41,11 +41,12 @@
import org.eclipse.jface.text.ITypedRegion;
import org.eclipse.jface.text.Region;
+import org.eclipse.statet.jcommons.collections.ImCollections;
+import org.eclipse.statet.jcommons.collections.ImList;
+
import org.eclipse.statet.ecommons.text.core.DocumentEnhancer;
import org.eclipse.statet.ecommons.text.core.IDocumentEnhancement;
import org.eclipse.statet.ecommons.text.core.treepartitioner.ITreePartitionNodeScan.BreakException;
-import org.eclipse.statet.jcommons.collections.ImCollections;
-import org.eclipse.statet.jcommons.collections.ImList;
/**
diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/.settings/org.eclipse.jdt.ui.prefs b/ecommons/org.eclipse.statet.ecommons.uimisc/.settings/org.eclipse.jdt.ui.prefs
index abdf3e0..ecf6dfa 100644
--- a/ecommons/org.eclipse.statet.ecommons.uimisc/.settings/org.eclipse.jdt.ui.prefs
+++ b/ecommons/org.eclipse.statet.ecommons.uimisc/.settings/org.eclipse.jdt.ui.prefs
@@ -64,7 +64,7 @@
org.eclipse.jdt.ui.exception.name=e
org.eclipse.jdt.ui.gettersetter.use.is=true
org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet;
+org.eclipse.jdt.ui.importorder=\#;java;javax;com.ibm.icu;org.osgi;org.eclipse;;org.eclipse.statet.jcommons;org.eclipse.statet;
org.eclipse.jdt.ui.javadoc=true
org.eclipse.jdt.ui.keywordthis=true
org.eclipse.jdt.ui.ondemandthreshold=99
diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/preferences/ui/ManagedConfigurationBlock.java b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/preferences/ui/ManagedConfigurationBlock.java
index 0a4a189..1ea53dc 100644
--- a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/preferences/ui/ManagedConfigurationBlock.java
+++ b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/preferences/ui/ManagedConfigurationBlock.java
@@ -41,6 +41,10 @@
import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
import org.eclipse.ui.preferences.IWorkingCopyManager;
+import org.eclipse.statet.jcommons.collections.ImCollections;
+import org.eclipse.statet.jcommons.collections.ImList;
+import org.eclipse.statet.jcommons.collections.ImSet;
+
import org.eclipse.statet.ecommons.databinding.jface.DataBindingSupport;
import org.eclipse.statet.ecommons.preferences.SettingsChangeNotifier;
import org.eclipse.statet.ecommons.preferences.core.Preference;
@@ -48,9 +52,6 @@
import org.eclipse.statet.ecommons.preferences.core.PreferenceSetService;
import org.eclipse.statet.ecommons.resources.core.BuildUtils;
import org.eclipse.statet.ecommons.runtime.core.StatusChangeListener;
-import org.eclipse.statet.jcommons.collections.ImCollections;
-import org.eclipse.statet.jcommons.collections.ImList;
-import org.eclipse.statet.jcommons.collections.ImSet;
/**
diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/preferences/ui/PreferenceSetUIListener.java b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/preferences/ui/PreferenceSetUIListener.java
index 176510e..f963bc0 100644
--- a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/preferences/ui/PreferenceSetUIListener.java
+++ b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/preferences/ui/PreferenceSetUIListener.java
@@ -19,11 +19,12 @@
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
+import org.eclipse.statet.jcommons.collections.ImSet;
+
import org.eclipse.statet.ecommons.preferences.core.PreferenceAccess;
import org.eclipse.statet.ecommons.preferences.core.PreferenceSetService;
import org.eclipse.statet.ecommons.preferences.core.PreferenceSetService.ChangeEvent;
import org.eclipse.statet.ecommons.ui.util.UIAccess;
-import org.eclipse.statet.jcommons.collections.ImSet;
public abstract class PreferenceSetUIListener implements PreferenceSetService.ChangeListener, Listener {
diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/components/ButtonGroup.java b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/components/ButtonGroup.java
index 9a9490f..4013e13 100644
--- a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/components/ButtonGroup.java
+++ b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/components/ButtonGroup.java
@@ -46,12 +46,13 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
+import org.eclipse.statet.jcommons.collections.ImCollections;
+import org.eclipse.statet.jcommons.collections.ImList;
+
import org.eclipse.statet.ecommons.ui.SharedMessages;
import org.eclipse.statet.ecommons.ui.util.LayoutUtil;
import org.eclipse.statet.ecommons.ui.util.UIAccess;
import org.eclipse.statet.ecommons.ui.viewers.ViewerUtils;
-import org.eclipse.statet.jcommons.collections.ImCollections;
-import org.eclipse.statet.jcommons.collections.ImList;
/**
diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/components/CustomizableVariableSelectionDialog.java b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/components/CustomizableVariableSelectionDialog.java
index 82e0745..e99db4f 100644
--- a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/components/CustomizableVariableSelectionDialog.java
+++ b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/components/CustomizableVariableSelectionDialog.java
@@ -24,10 +24,11 @@
import org.eclipse.debug.ui.StringVariableSelectionDialog;
import org.eclipse.swt.widgets.Shell;
-import org.eclipse.statet.ecommons.variables.core.VariableUtils;
import org.eclipse.statet.jcommons.collections.ImCollections;
import org.eclipse.statet.jcommons.collections.ImList;
+import org.eclipse.statet.ecommons.variables.core.VariableUtils;
+
/**
* {@link StringVariableSelectionDialog} with option to exclude and add variables.
diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/components/DropDownButton.java b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/components/DropDownButton.java
index 3bed5d8..8e31d65 100644
--- a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/components/DropDownButton.java
+++ b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/components/DropDownButton.java
@@ -31,10 +31,11 @@
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Menu;
+import org.eclipse.statet.jcommons.collections.CopyOnWriteIdentityListSet;
+
import org.eclipse.statet.ecommons.ui.util.MenuUtils;
import org.eclipse.statet.internal.ecommons.ui.AccessibleArrowImage;
import org.eclipse.statet.internal.ecommons.ui.UIMiscellanyPlugin;
-import org.eclipse.statet.jcommons.collections.CopyOnWriteIdentityListSet;
public class DropDownButton extends Composite {
diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/components/SearchText.java b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/components/SearchText.java
index 97f2fb9..ac35a32 100644
--- a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/components/SearchText.java
+++ b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/components/SearchText.java
@@ -41,9 +41,10 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.statet.ecommons.ui.SharedUIResources;
import org.eclipse.statet.jcommons.collections.CopyOnWriteIdentityListSet;
+import org.eclipse.statet.ecommons.ui.SharedUIResources;
+
/**
* Search text custom widget (with clear button)
diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/components/WaScale.java b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/components/WaScale.java
index cc8cc89..46daee5 100644
--- a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/components/WaScale.java
+++ b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/components/WaScale.java
@@ -38,9 +38,10 @@
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Shell;
+import org.eclipse.statet.jcommons.collections.ImCollections;
+
import org.eclipse.statet.ecommons.collections.FastList;
import org.eclipse.statet.internal.ecommons.ui.UIMiscellanyPlugin;
-import org.eclipse.statet.jcommons.collections.ImCollections;
/**
diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/mpbv/ManagedPageBookView.java b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/mpbv/ManagedPageBookView.java
index 0de8630..62d9bb2 100644
--- a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/mpbv/ManagedPageBookView.java
+++ b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/mpbv/ManagedPageBookView.java
@@ -51,13 +51,14 @@
import org.eclipse.ui.part.PageSwitcher;
import org.eclipse.ui.services.IServiceLocator;
+import org.eclipse.statet.jcommons.collections.ImCollections;
+import org.eclipse.statet.jcommons.collections.ImList;
+
import org.eclipse.statet.ecommons.ui.SharedUIResources;
import org.eclipse.statet.ecommons.ui.actions.HandlerCollection;
import org.eclipse.statet.ecommons.ui.actions.HandlerContributionItem;
import org.eclipse.statet.ecommons.ui.actions.SimpleContributionItem;
import org.eclipse.statet.ecommons.ui.util.StatusLineMessageManager;
-import org.eclipse.statet.jcommons.collections.ImCollections;
-import org.eclipse.statet.jcommons.collections.ImList;
public abstract class ManagedPageBookView<S extends ISession> extends PageBookView {
diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/viewers/ViewerUtils.java b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/viewers/ViewerUtils.java
index ceed1af..3ecb88c 100644
--- a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/viewers/ViewerUtils.java
+++ b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/viewers/ViewerUtils.java
@@ -77,13 +77,14 @@
import org.eclipse.swt.widgets.TreeColumn;
import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.statet.ecommons.ui.components.SearchText;
-import org.eclipse.statet.ecommons.ui.util.PixelConverter;
-import org.eclipse.statet.ecommons.ui.util.UIAccess;
import org.eclipse.statet.jcommons.collections.CopyOnWriteIdentityListSet;
import org.eclipse.statet.jcommons.collections.ImCollections;
import org.eclipse.statet.jcommons.collections.ImList;
+import org.eclipse.statet.ecommons.ui.components.SearchText;
+import org.eclipse.statet.ecommons.ui.util.PixelConverter;
+import org.eclipse.statet.ecommons.ui.util.UIAccess;
+
/**
* Utility class for JFace viewers
diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/workbench/ResourceInputComposite.java b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/workbench/ResourceInputComposite.java
index 8c25b87..4b64b46 100644
--- a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/workbench/ResourceInputComposite.java
+++ b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/workbench/ResourceInputComposite.java
@@ -60,6 +60,9 @@
import org.eclipse.ui.dialogs.ContainerSelectionDialog;
import org.eclipse.ui.dialogs.FilteredResourcesSelectionDialog;
+import org.eclipse.statet.jcommons.collections.ImCollections;
+import org.eclipse.statet.jcommons.collections.ImList;
+
import org.eclipse.statet.ecommons.io.ObservableFileValidator;
import org.eclipse.statet.ecommons.ui.SharedMessages;
import org.eclipse.statet.ecommons.ui.components.CustomizableVariableSelectionDialog;
@@ -67,8 +70,6 @@
import org.eclipse.statet.ecommons.ui.util.LayoutUtil;
import org.eclipse.statet.ecommons.ui.util.MessageUtils;
import org.eclipse.statet.internal.ecommons.ui.Messages;
-import org.eclipse.statet.jcommons.collections.ImCollections;
-import org.eclipse.statet.jcommons.collections.ImList;
/**
diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/internal/ecommons/ui/UIMiscellanyPlugin.java b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/internal/ecommons/ui/UIMiscellanyPlugin.java
index d144bbc..dc72030 100644
--- a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/internal/ecommons/ui/UIMiscellanyPlugin.java
+++ b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/internal/ecommons/ui/UIMiscellanyPlugin.java
@@ -33,12 +33,13 @@
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.eclipse.statet.jcommons.lang.Disposable;
+
import org.eclipse.statet.ecommons.ui.ColorManager;
import org.eclipse.statet.ecommons.ui.SharedUIResources;
import org.eclipse.statet.ecommons.ui.util.ImageDescriptorRegistry;
import org.eclipse.statet.ecommons.ui.util.ImageRegistryUtil;
import org.eclipse.statet.ecommons.ui.util.UIAccess;
-import org.eclipse.statet.jcommons.lang.Disposable;
public class UIMiscellanyPlugin extends AbstractUIPlugin {
