Code Cleanup

15 files changed, 31 insertions, 31 deletions

diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterFilesystemPackagesAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterFilesystemPackagesAction.java
index 056ba8f6f6..235b646b99 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterFilesystemPackagesAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterFilesystemPackagesAction.java
@@ -37,7 +37,7 @@ public class RegisterFilesystemPackagesAction extends RegisterPackagesAction
   private static final String TOOL_TIP = "Register dynamic packages from the filesystem";
 
   private static final String[] FILTER_NAMES = { "Ecore models (*.ecore)", "XMI files (*.xmi)", "XML files (*.xml)",
-      "All files (*.*)" };
+  "All files (*.*)" };
 
   private static final String[] FILTER_EXTENSIONS = { "ecore", "xmi", "xml", null };
 
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java
index 9aed0b080a..1d847f1c27 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java
@@ -46,7 +46,7 @@ public class RegisterGeneratedPackagesAction extends RegisterPackagesAction
     Shell shell = page.getWorkbenchWindow().getShell();
     SelectPackageDialog dialog = new SelectPackageDialog(shell, "Generated Packages",
         "Select one or more packages for registration with the CDO package registry", session.getPackageRegistry()
-            .keySet());
+        .keySet());
 
     if (dialog.open() == SelectPackageDialog.OK)
     {
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RollbackTransactionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RollbackTransactionAction.java
index c1c135ea2a..54f49e54dd 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RollbackTransactionAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RollbackTransactionAction.java
@@ -50,7 +50,7 @@ public final class RollbackTransactionAction extends ViewAction
       break;
     default:
       cancel();
-      break;
+    break;
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
index ec2c73719e..43386c9166 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
@@ -43,20 +43,20 @@ public abstract class OM
 
   public static final OMPreferences PREFS = BUNDLE.preferences();
 
-  public static final OMPreference<String> PREF_LABEL_DECORATION = // 
-  PREFS.init("PREF_LABEL_DECORATION", CDOLabelProvider.DEFAULT_DECORATION); //$NON-NLS-1$
+  public static final OMPreference<String> PREF_LABEL_DECORATION = //
+    PREFS.init("PREF_LABEL_DECORATION", CDOLabelProvider.DEFAULT_DECORATION); //$NON-NLS-1$
 
   public static final OMPreference<String[]> PREF_HISTORY_SELECT_PACKAGES = //
-  PREFS.initArray("PREF_HISTORY_SELECT_PACKAGES"); //$NON-NLS-1$
+    PREFS.initArray("PREF_HISTORY_SELECT_PACKAGES"); //$NON-NLS-1$
 
   public static final OMPreference<String[]> PREF_HISTORY_CONNECTORS = //
-  PREFS.initArray("PREF_HISTORY_CONNECTORS"); //$NON-NLS-1$
+    PREFS.initArray("PREF_HISTORY_CONNECTORS"); //$NON-NLS-1$
 
   public static final OMPreference<String[]> PREF_HISTORY_REPOSITORIES = //
-  PREFS.initArray("PREF_HISTORY_REPOSITORIES"); //$NON-NLS-1$
+    PREFS.initArray("PREF_HISTORY_REPOSITORIES"); //$NON-NLS-1$
 
   public static final OMPreference<Boolean> PREF_LEGACY_SUPPORT = //
-  PREFS.init("PREF_LEGACY_SUPPORT", true); //$NON-NLS-1$
+    PREFS.init("PREF_LEGACY_SUPPORT", true); //$NON-NLS-1$
 
   static void start()
   {
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java
index aa6f5edd18..acefb003c8 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java
@@ -216,7 +216,7 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
     super.contributeToMenu(menuManager);
 
     IMenuManager submenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CDOEditor_menu"),
-        "org.eclipse.emf.cdo.internal.ui.editorMenuID");
+    "org.eclipse.emf.cdo.internal.ui.editorMenuID");
     menuManager.insertAfter("additions", submenuManager);
     submenuManager.add(new Separator("settings"));
     submenuManager.add(new Separator("actions"));
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
index d63e4f5311..ad465d9f1c 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
@@ -156,7 +156,7 @@ import java.util.Map;
  * @generated
  */
 public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProvider, ISelectionProvider,
-    IMenuListener, IViewerProvider, IGotoMarker
+IMenuListener, IViewerProvider, IGotoMarker
 {
   /**
    * @ADDED
@@ -1710,7 +1710,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
     setPartName(editorInput.getName());
     IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null ? getActionBars()
         .getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
-    doSave(progressMonitor);
+        doSave(progressMonitor);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOPreferencePage.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOPreferencePage.java
index e68109643d..ab6a405b53 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOPreferencePage.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOPreferencePage.java
@@ -124,7 +124,7 @@ public class CDOPreferencePage extends OMPreferencePage
     preloadChunkSize.setValue(String
         .valueOf(org.eclipse.emf.internal.cdo.bundle.OM.PREF_LOAD_REVISION_COLLECTION_CHUNK_SIZE.getValue()));
     invalidationNotifications
-        .setSelection(org.eclipse.emf.internal.cdo.bundle.OM.PREF_ENABLE_INVALIDATION_NOTIFICATIONS.getValue());
+    .setSelection(org.eclipse.emf.internal.cdo.bundle.OM.PREF_ENABLE_INVALIDATION_NOTIFICATIONS.getValue());
     commitTimeout.setValue(String
         .valueOf(org.eclipse.emf.internal.cdo.bundle.OM.PREF_DEFAULT_COMMIT_TIMEOUT.getValue()));
   }
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEventHandler.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEventHandler.java
index 5bd42d4f4c..06c9b7d16e 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEventHandler.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEventHandler.java
@@ -156,7 +156,7 @@ public class CDOEventHandler
 
   public void setViewer(TreeViewer viewer)
   {
-    this.treeViewer = viewer;
+    treeViewer = viewer;
   }
 
   protected void sessionInvalidated(Set<CDOID> dirtyOIDs)
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java
index 60063ef98d..77fd4c5a40 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java
@@ -318,12 +318,12 @@ public class CDOItemProvider extends ContainerItemProvider<IContainer<Object>>
     Set<Map.Entry<String, CDOPackageType>> entrySet = CDOUtil.getPackageTypes().entrySet();
     List<Map.Entry<String, CDOPackageType>> entryList = new ArrayList<Map.Entry<String, CDOPackageType>>(entrySet);
     Collections.sort(entryList, new Comparator<Map.Entry<String, CDOPackageType>>()
-    {
+        {
       public int compare(Map.Entry<String, CDOPackageType> e1, Map.Entry<String, CDOPackageType> e2)
       {
         return e1.getKey().compareTo(e2.getKey());
       }
-    });
+        });
 
     Set<String> registeredURIs = new HashSet<String>(session.getPackageRegistry().keySet());
     boolean added = false;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
index 7987fa537e..36c35ee322 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
@@ -554,7 +554,7 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource
    * @author Eike Stepper
    */
   protected class TransientContents<E extends Object & EObject> extends NotifyingListImpl<E> implements
-      InternalEList<E>
+  InternalEList<E>
   {
     private static final long serialVersionUID = 1L;
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java
index e36d510f4c..c8fc2eb1d8 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java
@@ -39,7 +39,7 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto
     try
     {
       EresourceFactory theEresourceFactory = (EresourceFactory)EPackage.Registry.INSTANCE
-          .getEFactory("http://www.eclipse.org/emf/CDO/resource/1.0.0");
+      .getEFactory("http://www.eclipse.org/emf/CDO/resource/1.0.0");
       if (theEresourceFactory != null)
       {
         return theEresourceFactory;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java
index 2df8cb779a..973d116538 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java
@@ -136,7 +136,7 @@ public final class CDOUtil
 
   public static CDOSession openSession(IConnector connector, String repositoryName, boolean disableLegacyObjects,
       EPackage.Registry delegate, IFailOverStrategy failOverStrategy) throws ConnectorException
-  {
+      {
     CDOSessionImpl session = new CDOSessionImpl(delegate);
     session.setFailOverStrategy(failOverStrategy);
     session.setConnector(connector);
@@ -144,10 +144,10 @@ public final class CDOUtil
     session.setDisableLegacyObjects(disableLegacyObjects);
     LifecycleUtil.activate(session);
     return session;
-  }
+      }
 
   public static CDOSession openSession(IConnector connector, String repositoryName, boolean disableLegacyObjects)
-      throws ConnectorException
+  throws ConnectorException
   {
     return openSession(connector, repositoryName, disableLegacyObjects, null, null);
   }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
index 2b86ecb219..1b8d263f8b 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
@@ -370,7 +370,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
    * @author Eike Stepper
    */
   private final class CommitTransition implements
-      ITransition<CDOState, CDOEvent, InternalCDOObject, CommitTransactionResult>
+  ITransition<CDOState, CDOEvent, InternalCDOObject, CommitTransactionResult>
   {
     public void execute(InternalCDOObject object, CDOState state, CDOEvent event, CommitTransactionResult data)
     {
@@ -539,7 +539,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
    * @author Eike Stepper
    */
   private final class LoadResourceTransition implements
-      ITransition<CDOState, CDOEvent, InternalCDOObject, ResourceAndView>
+  ITransition<CDOState, CDOEvent, InternalCDOObject, ResourceAndView>
   {
     public void execute(InternalCDOObject object, CDOState state, CDOEvent event, ResourceAndView data)
     {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
index bd237fb294..1631b7e32f 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
@@ -68,7 +68,7 @@ import java.util.concurrent.ConcurrentMap;
  * @author Eike Stepper
  */
 public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier implements CDOView, CDOIDProvider,
-    Adapter.Internal
+Adapter.Internal
 {
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_VIEW, CDOViewImpl.class);
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java
index 587e7547b9..d925aef698 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java
@@ -63,23 +63,23 @@ public abstract class OM
   public static final OMPreferences PREFS = BUNDLE.preferences();
 
   public static final OMPreference<String> PREF_REPOSITORY_NAME = //
-  PREFS.initString("PREF_REPOSITORY_NAME"); //$NON-NLS-1$
+    PREFS.initString("PREF_REPOSITORY_NAME"); //$NON-NLS-1$
 
   public static final OMPreference<String> PREF_USER_NAME = //
-  PREFS.initString("PREF_USER_NAME"); //$NON-NLS-1$
+    PREFS.initString("PREF_USER_NAME"); //$NON-NLS-1$
 
   public static final OMPreference<String> PREF_CONNECTOR_DESCRIPTION = //
-  PREFS.initString("PREF_CONNECTOR_DESCRIPTION"); //$NON-NLS-1$
+    PREFS.initString("PREF_CONNECTOR_DESCRIPTION"); //$NON-NLS-1$
 
   public static final OMPreference<Integer> PREF_REFERENCE_CHUNK_SIZE = //
-  PREFS.init("PREF_REFERENCE_CHUNK_SIZE", CDORevision.UNCHUNKED); //$NON-NLS-1$
+    PREFS.init("PREF_REFERENCE_CHUNK_SIZE", CDORevision.UNCHUNKED); //$NON-NLS-1$
 
   public static final OMPreference<Boolean> PREF_ENABLE_INVALIDATION_NOTIFICATIONS = //
-  PREFS.init("PREF_ENABLE_INVALIDATION_NOTIFICATIONS", false); //$NON-NLS-1$
+    PREFS.init("PREF_ENABLE_INVALIDATION_NOTIFICATIONS", false); //$NON-NLS-1$
 
   public static final OMPreference<Integer> PREF_LOAD_REVISION_COLLECTION_CHUNK_SIZE = //
-  PREFS.init("PREF_LOAD_REVISION_COLLECTION_CHUNK_SIZE", CDOView.NO_PRELOAD); //$NON-NLS-1$
+    PREFS.init("PREF_LOAD_REVISION_COLLECTION_CHUNK_SIZE", CDOView.NO_PRELOAD); //$NON-NLS-1$
 
   public static final OMPreference<Long> PREF_DEFAULT_COMMIT_TIMEOUT = //
-  PREFS.init("PREF_DEFAULT_COMMIT_TIMEOUT", CDOTransaction.DEFAULT_COMMIT_TIMEOUT); //$NON-NLS-1$
+    PREFS.init("PREF_DEFAULT_COMMIT_TIMEOUT", CDOTransaction.DEFAULT_COMMIT_TIMEOUT); //$NON-NLS-1$
 }