[Releng] Reformat everything with M6 formatter

15 files changed, 218 insertions, 242 deletions

diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java
index 8425bad8ff..6b3693edbb 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java
@@ -124,9 +124,9 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
   }
 
   /**
-  * @since 2.0
-  * @deprecated as of 4.4 not used any more.
-  */
+   * @since 2.0
+   * @deprecated as of 4.4 not used any more.
+   */
   @Deprecated
   protected void addIDDescriptor(Object object)
   {
@@ -134,9 +134,9 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
   }
 
   /**
-  * @since 2.0
-  * @deprecated as of 4.4 not used any more.
-  */
+   * @since 2.0
+   * @deprecated as of 4.4 not used any more.
+   */
   @Deprecated
   protected void addVersionDescriptor(Object object)
   {
@@ -144,9 +144,9 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
   }
 
   /**
-  * @since 2.0
-  * @deprecated as of 4.4 not used any more.
-  */
+   * @since 2.0
+   * @deprecated as of 4.4 not used any more.
+   */
   @Deprecated
   protected void addStateDescriptor(Object object)
   {
@@ -154,9 +154,9 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
   }
 
   /**
-  * @since 2.0
-  * @deprecated as of 4.4 not used any more.
-  */
+   * @since 2.0
+   * @deprecated as of 4.4 not used any more.
+   */
   @Deprecated
   protected void addViewDescriptor(Object object)
   {
@@ -164,9 +164,9 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
   }
 
   /**
-  * @since 2.0
-  * @deprecated as of 4.4 not used any more.
-  */
+   * @since 2.0
+   * @deprecated as of 4.4 not used any more.
+   */
   @Deprecated
   protected void addContainerDescriptor(Object object)
   {
@@ -174,9 +174,9 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
   }
 
   /**
-  * @since 2.0
-  * @deprecated as of 4.4 not used any more.
-  */
+   * @since 2.0
+   * @deprecated as of 4.4 not used any more.
+   */
   @Deprecated
   protected void addDirectResourceDescriptor(Object object)
   {
@@ -184,9 +184,9 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
   }
 
   /**
-  * @since 2.0
-  * @deprecated as of 4.4 not used any more.
-  */
+   * @since 2.0
+   * @deprecated as of 4.4 not used any more.
+   */
   @Deprecated
   protected void addReadLockedDescriptor(Object object)
   {
@@ -194,9 +194,9 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
   }
 
   /**
-  * @since 2.0
-  * @deprecated as of 4.4 not used any more.
-  */
+   * @since 2.0
+   * @deprecated as of 4.4 not used any more.
+   */
   @Deprecated
   protected void addWriteLockedDescriptor(Object object)
   {
@@ -204,9 +204,9 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
   }
 
   /**
-  * @since 4.3
-  * @deprecated as of 4.4 not used any more.
-  */
+   * @since 4.3
+   * @deprecated as of 4.4 not used any more.
+   */
   @Deprecated
   protected void addWriteOptionDescriptor(Object object)
   {
@@ -214,9 +214,9 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
   }
 
   /**
-  * @since 2.0
-  * @deprecated as of 4.4 not used any more.
-  */
+   * @since 2.0
+   * @deprecated as of 4.4 not used any more.
+   */
   @Deprecated
   protected void addAdaptersDescriptor(Object object)
   {
@@ -224,9 +224,9 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
   }
 
   /**
-  * @since 2.0
-  * @deprecated as of 4.4 not used any more.
-  */
+   * @since 2.0
+   * @deprecated as of 4.4 not used any more.
+   */
   @Deprecated
   protected void addChangeSubscriptionPoliciesDescriptor(Object object)
   {
@@ -234,9 +234,9 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
   }
 
   /**
-  * @since 2.0
-  * @deprecated as of 4.4 not used any more.
-  */
+   * @since 2.0
+   * @deprecated as of 4.4 not used any more.
+   */
   @Deprecated
   protected void addURIDescriptor(Object object)
   {
@@ -437,60 +437,60 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
   }
 
   /**
-  * Adds the {@link CDOID} of a {@link CDOObject} to the Properties view.
-  *
-  * @author Victor Roldan Betancort
-  * @since 2.0
-  * @deprecated as of 4.4 not used any more.
-  */
+   * Adds the {@link CDOID} of a {@link CDOObject} to the Properties view.
+   *
+   * @author Victor Roldan Betancort
+   * @since 2.0
+   * @deprecated as of 4.4 not used any more.
+   */
   @Deprecated
   public static class IDDescriptor extends CDOPropertyDescriptor
   {
   }
 
   /**
-  * Adds the version of a {@link CDOObject} to the Properties view.
-  *
-  * @author Victor Roldan Betancort
-  * @since 2.0
-  * @deprecated as of 4.4 not used any more.
-  */
+   * Adds the version of a {@link CDOObject} to the Properties view.
+   *
+   * @author Victor Roldan Betancort
+   * @since 2.0
+   * @deprecated as of 4.4 not used any more.
+   */
   @Deprecated
   public static class VersionDescriptor extends CDOPropertyDescriptor
   {
   }
 
   /**
-  * Adds the {@link CDOState state} of a {@link CDOObject} to the Properties view.
-  *
-  * @author Victor Roldan Betancort
-  * @since 2.0
-  * @deprecated as of 4.4 not used any more.
-  */
+   * Adds the {@link CDOState state} of a {@link CDOObject} to the Properties view.
+   *
+   * @author Victor Roldan Betancort
+   * @since 2.0
+   * @deprecated as of 4.4 not used any more.
+   */
   @Deprecated
   public static class StateDescriptor extends CDOPropertyDescriptor
   {
   }
 
   /**
-  * Adds the associate {@link CDOView view} of a {@link CDOObject} to the Properties view.
-  *
-  * @author Victor Roldan Betancort
-  * @since 2.0
-  * @deprecated as of 4.4 not used any more.
-  */
+   * Adds the associate {@link CDOView view} of a {@link CDOObject} to the Properties view.
+   *
+   * @author Victor Roldan Betancort
+   * @since 2.0
+   * @deprecated as of 4.4 not used any more.
+   */
   @Deprecated
   public static class ViewDescriptor extends CDOPropertyDescriptor
   {
   }
 
   /**
-  * Adds the {@link EObject#eContainer() eContainer} of a {@link CDOObject} to the Properties view.
-  *
-  * @author Victor Roldan Betancort
-  * @since 2.0
-  * @deprecated as of 4.4 not used any more.
-  */
+   * Adds the {@link EObject#eContainer() eContainer} of a {@link CDOObject} to the Properties view.
+   *
+   * @author Victor Roldan Betancort
+   * @since 2.0
+   * @deprecated as of 4.4 not used any more.
+   */
   @Deprecated
   public static class ContainerDescriptor extends CDOPropertyDescriptor
   {
@@ -500,84 +500,84 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
   }
 
   /**
-  * Adds the {@link InternalEObject#eDirectResource() direct resource} of a {@link CDOObject} to the Properties view.
-  *
-  * @author Victor Roldan Betancort
-  * @since 2.0
-  * @deprecated as of 4.4 not used any more.
-  */
+   * Adds the {@link InternalEObject#eDirectResource() direct resource} of a {@link CDOObject} to the Properties view.
+   *
+   * @author Victor Roldan Betancort
+   * @since 2.0
+   * @deprecated as of 4.4 not used any more.
+   */
   @Deprecated
   public static class DirectResourceDescriptor extends CDOPropertyDescriptor
   {
   }
 
   /**
-  * Adds the {@link CDOLock read lock} of a {@link CDOObject} to the Properties view.
-  *
-  * @author Victor Roldan Betancort
-  * @since 2.0
-  * @deprecated as of 4.4 not used any more.
-  */
+   * Adds the {@link CDOLock read lock} of a {@link CDOObject} to the Properties view.
+   *
+   * @author Victor Roldan Betancort
+   * @since 2.0
+   * @deprecated as of 4.4 not used any more.
+   */
   @Deprecated
   public static class ReadLockedDescriptor extends CDOPropertyDescriptor
   {
   }
 
   /**
-  * Adds the {@link CDOLock write lock} of a {@link CDOObject} to the Properties view.
-  *
-  * @author Victor Roldan Betancort
-  * @since 2.0
-  * @deprecated as of 4.4 not used any more.
-  */
+   * Adds the {@link CDOLock write lock} of a {@link CDOObject} to the Properties view.
+   *
+   * @author Victor Roldan Betancort
+   * @since 2.0
+   * @deprecated as of 4.4 not used any more.
+   */
   @Deprecated
   public static class WriteLockedDescriptor extends CDOPropertyDescriptor
   {
   }
 
   /**
-  * Adds the {@link CDOLock write option} of a {@link CDOObject} to the Properties view.
-  *
-  * @author Eike Stepper
-  * @since 4.3
-  * @deprecated as of 4.4 not used any more.
-  */
+   * Adds the {@link CDOLock write option} of a {@link CDOObject} to the Properties view.
+   *
+   * @author Eike Stepper
+   * @since 4.3
+   * @deprecated as of 4.4 not used any more.
+   */
   @Deprecated
   public static class WriteOptionDescriptor extends CDOPropertyDescriptor
   {
   }
 
   /**
-  * Adds the {@link EObject#eAdapters() eAdapters} list of a {@link CDOObject} to the Properties view.
-  *
-  * @author Victor Roldan Betancort
-  * @since 2.0
-  * @deprecated as of 4.4 not used any more.
-  */
+   * Adds the {@link EObject#eAdapters() eAdapters} list of a {@link CDOObject} to the Properties view.
+   *
+   * @author Victor Roldan Betancort
+   * @since 2.0
+   * @deprecated as of 4.4 not used any more.
+   */
   @Deprecated
   public static class AdaptersDescriptor extends CDOPropertyDescriptor
   {
   }
 
   /**
-  * Adds the change subscription policies list of a {@link CDOObject} to the Properties view.
-  *
-  * @author Victor Roldan Betancort
-  * @since 2.0
-  * @deprecated as of 4.4 not used any more.
-  */
+   * Adds the change subscription policies list of a {@link CDOObject} to the Properties view.
+   *
+   * @author Victor Roldan Betancort
+   * @since 2.0
+   * @deprecated as of 4.4 not used any more.
+   */
   @Deprecated
   public static class ChangeSubscriptionPoliciesDescriptor extends CDOPropertyDescriptor
   {
   }
 
   /**
-  * Adds the URI of a {@link CDOObject} to the Properties view.
-  *
-  * @author Victor Roldan Betancort
-  * @since 2.0
-  * @deprecated as of 4.4 not used any more.
-  */
+   * Adds the URI of a {@link CDOObject} to the Properties view.
+   *
+   * @author Victor Roldan Betancort
+   * @since 2.0
+   * @deprecated as of 4.4 not used any more.
+   */
   @Deprecated
   public static class URIDescriptor extends CDOPropertyDescriptor
   {
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/package-info.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/package-info.java
index 921ad6b199..c3ac72d08b 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011, 2012, 2014 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Eike Stepper - initial API and implementation
+ * Copyright (c) 2011, 2012, 2014 Eike Stepper (Berlin, Germany) and others. All rights reserved. This program and the
+ * accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this
+ * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: Eike Stepper - initial API
+ * and implementation
  */
 
 /**
  * Useful base classes that can be referenced from custom EMF generator models.
  */
 package org.eclipse.emf.cdo.edit;
-
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOBinaryResourceItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOBinaryResourceItemProvider.java
index b77b28edbd..dc28a122b5 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOBinaryResourceItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOBinaryResourceItemProvider.java
@@ -42,8 +42,8 @@ import java.util.List;
  * @generated
  */
 public class CDOBinaryResourceItemProvider extends CDOFileResourceItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-    ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
+ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -80,12 +80,10 @@ public class CDOBinaryResourceItemProvider extends CDOFileResourceItemProvider i
   protected void addContentsPropertyDescriptor(Object object)
   {
     itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(
-            ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(),
-            getString("_UI_CDOBinaryResource_contents_feature"), //$NON-NLS-1$
-            getString(
-                "_UI_PropertyDescriptor_description", "_UI_CDOBinaryResource_contents_feature", "_UI_CDOBinaryResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+        getResourceLocator(), getString("_UI_CDOBinaryResource_contents_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_CDOBinaryResource_contents_feature", //$NON-NLS-1$ //$NON-NLS-2$
+                "_UI_CDOBinaryResource_type"), //$NON-NLS-1$
             EresourcePackage.Literals.CDO_BINARY_RESOURCE__CONTENTS, true, false, false,
             ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
@@ -121,7 +119,8 @@ public class CDOBinaryResourceItemProvider extends CDOFileResourceItemProvider i
   public String getText(Object object)
   {
     String label = ((CDOBinaryResource)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_CDOBinaryResource_type") : //$NON-NLS-1$
+    return label == null || label.length() == 0 ? getString("_UI_CDOBinaryResource_type") //$NON-NLS-1$
+        :
         label;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOFileResourceItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOFileResourceItemProvider.java
index 9f330fff8f..685a5ca5d3 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOFileResourceItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOFileResourceItemProvider.java
@@ -38,8 +38,8 @@ import java.util.List;
  * @generated
  */
 public class CDOFileResourceItemProvider extends CDOResourceLeafItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-    ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
+ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -98,7 +98,8 @@ public class CDOFileResourceItemProvider extends CDOResourceLeafItemProvider imp
   public String getText(Object object)
   {
     String label = ((CDOFileResource<?>)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_CDOFileResource_type") : //$NON-NLS-1$
+    return label == null || label.length() == 0 ? getString("_UI_CDOFileResource_type") //$NON-NLS-1$
+        :
         label;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java
index 40a94f23c2..8d5b77ecc0 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java
@@ -42,8 +42,8 @@ import java.util.List;
  * @since 2.0
  */
 public class CDOResourceFolderItemProvider extends CDOResourceNodeItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-    ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
+ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java
index 01ed33f889..36131d6b09 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java
@@ -46,8 +46,8 @@ import java.util.List;
  * @generated
  */
 public class CDOResourceItemProvider extends CDOResourceLeafItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-    ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
+ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -87,13 +87,12 @@ public class CDOResourceItemProvider extends CDOResourceLeafItemProvider impleme
    */
   protected void addURIPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_CDOResource_uRI_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_CDOResource_uRI_feature", "_UI_CDOResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        EresourcePackage.Literals.CDO_RESOURCE__URI, false, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_CDOResource_uRI_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_CDOResource_uRI_feature", "_UI_CDOResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            EresourcePackage.Literals.CDO_RESOURCE__URI, false, false, false,
+            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -103,13 +102,12 @@ public class CDOResourceItemProvider extends CDOResourceLeafItemProvider impleme
    */
   protected void addModifiedPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_CDOResource_modified_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_CDOResource_modified_feature", "_UI_CDOResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        EresourcePackage.Literals.CDO_RESOURCE__MODIFIED, false, false, false,
-        ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_CDOResource_modified_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_CDOResource_modified_feature", "_UI_CDOResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            EresourcePackage.Literals.CDO_RESOURCE__MODIFIED, false, false, false,
+            ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -119,13 +117,12 @@ public class CDOResourceItemProvider extends CDOResourceLeafItemProvider impleme
    */
   protected void addLoadedPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_CDOResource_loaded_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_CDOResource_loaded_feature", "_UI_CDOResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        EresourcePackage.Literals.CDO_RESOURCE__LOADED, false, false, false,
-        ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_CDOResource_loaded_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_CDOResource_loaded_feature", "_UI_CDOResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            EresourcePackage.Literals.CDO_RESOURCE__LOADED, false, false, false,
+            ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -137,12 +134,10 @@ public class CDOResourceItemProvider extends CDOResourceLeafItemProvider impleme
   protected void addTrackingModificationPropertyDescriptor(Object object)
   {
     itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(
-            ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(),
-            getString("_UI_CDOResource_trackingModification_feature"), //$NON-NLS-1$
-            getString(
-                "_UI_PropertyDescriptor_description", "_UI_CDOResource_trackingModification_feature", "_UI_CDOResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+        getResourceLocator(), getString("_UI_CDOResource_trackingModification_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_CDOResource_trackingModification_feature", //$NON-NLS-1$ //$NON-NLS-2$
+                "_UI_CDOResource_type"), //$NON-NLS-1$
             EresourcePackage.Literals.CDO_RESOURCE__TRACKING_MODIFICATION, true, false, false,
             ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
@@ -154,13 +149,13 @@ public class CDOResourceItemProvider extends CDOResourceLeafItemProvider impleme
    */
   protected void addTimeStampPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_CDOResource_timeStamp_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_CDOResource_timeStamp_feature", "_UI_CDOResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        EresourcePackage.Literals.CDO_RESOURCE__TIME_STAMP, true, false, false,
-        ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_CDOResource_timeStamp_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_CDOResource_timeStamp_feature", //$NON-NLS-1$ //$NON-NLS-2$
+                "_UI_CDOResource_type"), //$NON-NLS-1$
+            EresourcePackage.Literals.CDO_RESOURCE__TIME_STAMP, true, false, false,
+            ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceLeafItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceLeafItemProvider.java
index 03fbac32cc..d06b4d39b4 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceLeafItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceLeafItemProvider.java
@@ -38,8 +38,8 @@ import java.util.List;
  * @generated
  */
 public class CDOResourceLeafItemProvider extends CDOResourceNodeItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-    ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
+ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -87,7 +87,8 @@ public class CDOResourceLeafItemProvider extends CDOResourceNodeItemProvider imp
   public String getText(Object object)
   {
     String label = ((CDOResourceLeaf)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_CDOResourceLeaf_type") : //$NON-NLS-1$
+    return label == null || label.length() == 0 ? getString("_UI_CDOResourceLeaf_type") //$NON-NLS-1$
+        :
         getString("_UI_CDOResourceLeaf_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.java
index 5b55d8ac83..02f63a86d6 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.java
@@ -45,8 +45,8 @@ import java.util.List;
  * @since 2.0
  */
 public class CDOResourceNodeItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-    ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
+ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -84,12 +84,10 @@ public class CDOResourceNodeItemProvider extends CDOItemProviderAdapter implemen
   protected void addNamePropertyDescriptor(Object object)
   {
     itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(
-            ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(),
-            getString("_UI_CDOResourceNode_name_feature"), //$NON-NLS-1$
-            getString(
-                "_UI_PropertyDescriptor_description", "_UI_CDOResourceNode_name_feature", "_UI_CDOResourceNode_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+        getResourceLocator(), getString("_UI_CDOResourceNode_name_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_CDOResourceNode_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
+                "_UI_CDOResourceNode_type"), //$NON-NLS-1$
             EresourcePackage.Literals.CDO_RESOURCE_NODE__NAME, true, false, false,
             ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
@@ -102,12 +100,10 @@ public class CDOResourceNodeItemProvider extends CDOItemProviderAdapter implemen
   protected void addPathPropertyDescriptor(Object object)
   {
     itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(
-            ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(),
-            getString("_UI_CDOResourceNode_path_feature"), //$NON-NLS-1$
-            getString(
-                "_UI_PropertyDescriptor_description", "_UI_CDOResourceNode_path_feature", "_UI_CDOResourceNode_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+        getResourceLocator(), getString("_UI_CDOResourceNode_path_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_CDOResourceNode_path_feature", //$NON-NLS-1$ //$NON-NLS-2$
+                "_UI_CDOResourceNode_type"), //$NON-NLS-1$
             EresourcePackage.Literals.CDO_RESOURCE_NODE__PATH, false, false, false,
             ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
@@ -142,7 +138,8 @@ public class CDOResourceNodeItemProvider extends CDOItemProviderAdapter implemen
   public String getText(Object object)
   {
     String label = ((CDOResourceNode)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_CDOResourceNode_type") : //$NON-NLS-1$
+    return label == null || label.length() == 0 ? getString("_UI_CDOResourceNode_type") //$NON-NLS-1$
+        :
         getString("_UI_CDOResourceNode_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOTextResourceItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOTextResourceItemProvider.java
index 9dc0e045ea..5a7f471197 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOTextResourceItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOTextResourceItemProvider.java
@@ -42,8 +42,8 @@ import java.util.List;
  * @generated
  */
 public class CDOTextResourceItemProvider extends CDOFileResourceItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-    ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
+ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -80,14 +80,13 @@ public class CDOTextResourceItemProvider extends CDOFileResourceItemProvider imp
    */
   protected void addContentsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_CDOTextResource_contents_feature"), //$NON-NLS-1$
-        getString(
-            "_UI_PropertyDescriptor_description", "_UI_CDOTextResource_contents_feature", "_UI_CDOTextResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        EresourcePackage.Literals.CDO_TEXT_RESOURCE__CONTENTS, true, false, false,
-        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_CDOTextResource_contents_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_CDOTextResource_contents_feature", //$NON-NLS-1$ //$NON-NLS-2$
+                "_UI_CDOTextResource_type"), //$NON-NLS-1$
+            EresourcePackage.Literals.CDO_TEXT_RESOURCE__CONTENTS, true, false, false,
+            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -99,14 +98,13 @@ public class CDOTextResourceItemProvider extends CDOFileResourceItemProvider imp
    */
   protected void addEncodingPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_CDOTextResource_encoding_feature"), //$NON-NLS-1$
-        getString(
-            "_UI_PropertyDescriptor_description", "_UI_CDOTextResource_encoding_feature", "_UI_CDOTextResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        EresourcePackage.Literals.CDO_TEXT_RESOURCE__ENCODING, true, false, false,
-        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_CDOTextResource_encoding_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_CDOTextResource_encoding_feature", //$NON-NLS-1$ //$NON-NLS-2$
+                "_UI_CDOTextResource_type"), //$NON-NLS-1$
+            EresourcePackage.Literals.CDO_TEXT_RESOURCE__ENCODING, true, false, false,
+            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -140,7 +138,8 @@ public class CDOTextResourceItemProvider extends CDOFileResourceItemProvider imp
   public String getText(Object object)
   {
     String label = ((CDOTextResource)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_CDOTextResource_type") : //$NON-NLS-1$
+    return label == null || label.length() == 0 ? getString("_UI_CDOTextResource_type") //$NON-NLS-1$
+        :
         label;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
index 6deebc1164..4d4ff8643e 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
@@ -50,8 +50,8 @@ import java.util.List;
  *
  * @generated
  */
-public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory implements ComposeableAdapterFactory,
-    IChangeNotifier, IDisposable, IChildCreationExtender
+public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
+    implements ComposeableAdapterFactory, IChangeNotifier, IDisposable, IChildCreationExtender
 {
   /**
    * This keeps track of the root adapter factory that delegates to this adapter factory.
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/package-info.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/package-info.java
index c9be596225..05c65a989c 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/package-info.java
@@ -1,12 +1,8 @@
 /*
- * Copyright (c) 2011, 2012, 2014 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Eike Stepper - initial API and implementation
+ * Copyright (c) 2011, 2012, 2014 Eike Stepper (Berlin, Germany) and others. All rights reserved. This program and the
+ * accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this
+ * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: Eike Stepper - initial API
+ * and implementation
  */
 
 /**
@@ -15,4 +11,3 @@
  * @apiviz.exclude .*
  */
 package org.eclipse.emf.cdo.eresource.provider;
-
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/AnnotationItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/AnnotationItemProvider.java
index 8cf7748b9e..888c02871f 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/AnnotationItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/AnnotationItemProvider.java
@@ -43,8 +43,8 @@ import java.util.List;
  * @generated
  */
 public class AnnotationItemProvider extends ModelElementItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-    ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
+ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -81,13 +81,12 @@ public class AnnotationItemProvider extends ModelElementItemProvider implements
    */
   protected void addSourcePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_Annotation_source_feature"), //$NON-NLS-1$
-        getString("_UI_Annotation_source_description"), //$NON-NLS-1$
-        EtypesPackage.Literals.ANNOTATION__SOURCE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Annotation_source_feature"), //$NON-NLS-1$
+            getString("_UI_Annotation_source_description"), //$NON-NLS-1$
+            EtypesPackage.Literals.ANNOTATION__SOURCE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
@@ -97,11 +96,11 @@ public class AnnotationItemProvider extends ModelElementItemProvider implements
    */
   protected void addReferencesPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Annotation_references_feature"), //$NON-NLS-1$
-        getString("_UI_Annotation_references_description"), //$NON-NLS-1$
-        EtypesPackage.Literals.ANNOTATION__REFERENCES, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Annotation_references_feature"), //$NON-NLS-1$
+            getString("_UI_Annotation_references_description"), //$NON-NLS-1$
+            EtypesPackage.Literals.ANNOTATION__REFERENCES, true, false, true, null, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java
index c554dfd80b..a1ace809b3 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java
@@ -51,8 +51,8 @@ import java.util.List;
  * @since 4.0 <!-- end-user-doc -->
  * @generated
  */
-public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory implements ComposeableAdapterFactory,
-    IChangeNotifier, IDisposable, IChildCreationExtender
+public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory
+    implements ComposeableAdapterFactory, IChangeNotifier, IDisposable, IChildCreationExtender
 {
   /**
    * This keeps track of the root adapter factory that delegates to this adapter factory.
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/ModelElementItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/ModelElementItemProvider.java
index 375c973389..8de7586b04 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/ModelElementItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/ModelElementItemProvider.java
@@ -45,8 +45,8 @@ import java.util.List;
  * @generated
  */
 public class ModelElementItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-    ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
+ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/package-info.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/package-info.java
index 1303ea66a3..702064f3ba 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/package-info.java
@@ -1,12 +1,8 @@
 /*
- * Copyright (c) 2011, 2012, 2014 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Eike Stepper - initial API and implementation
+ * Copyright (c) 2011, 2012, 2014 Eike Stepper (Berlin, Germany) and others. All rights reserved. This program and the
+ * accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this
+ * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: Eike Stepper - initial API
+ * and implementation
  */
 
 /**
@@ -15,4 +11,3 @@
  * @apiviz.exclude .*
  */
 package org.eclipse.emf.cdo.etypes.provider;
-